From dc7c6d2355dce3f39e9e5bd5addecdeb868c8919 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:40:11 -0500 Subject: [PATCH] moved classes to org.gtreimagined.gt5r package --- .../gregtech/data/GT5RMaterialEvents.java | 1491 ----------------- .../gregtech/loader/SimpleMachineLoader.java | 2 - .../loader/machines/FermenterLoader.java | 11 - .../gtreimagined/gt5r}/GT5RConfig.java | 2 +- .../gtreimagined/gt5r}/GT5RPostRegistrar.java | 6 +- .../gtreimagined/gt5r}/GT5RRef.java | 2 +- .../gtreimagined/gt5r}/GT5Reimagined.java | 41 +- .../gtreimagined/gt5r}/GTRemapping.java | 4 +- .../gt5r}/block/BlockAsphalt.java | 4 +- .../gt5r}/block/BlockAsphaltSlab.java | 4 +- .../gt5r}/block/BlockAsphaltStair.java | 4 +- .../gtreimagined/gt5r}/block/BlockCasing.java | 2 +- .../gtreimagined/gt5r}/block/BlockCoil.java | 2 +- .../gt5r}/block/BlockColoredWall.java | 4 +- .../gt5r}/block/BlockFakeCasing.java | 2 +- .../gt5r}/block/BlockMiningPipe.java | 8 +- .../gt5r}/block/BlockPowderBarrel.java | 4 +- .../gt5r}/block/BlockSidedCasing.java | 2 +- .../miniportals/BlockEntityMiniEndPortal.java | 2 +- .../BlockEntityMiniNetherPortal.java | 2 +- .../miniportals/BlockEntityMiniPortal.java | 2 +- .../BlockEntityMiniTwilightPortal.java | 4 +- .../multi/BlockEntityAdvancedMiner.java | 2 +- .../multi/BlockEntityCharcoalPit.java | 6 +- .../multi/BlockEntityCokeOven.java | 2 +- .../multi/BlockEntityCombustionEngine.java | 6 +- .../multi/BlockEntityDistillationTower.java | 2 +- .../BlockEntityElectricBlastFurnace.java | 4 +- .../multi/BlockEntityFusionReactor.java | 8 +- .../multi/BlockEntityImplosionCompressor.java | 2 +- .../multi/BlockEntityLargeAutoclave.java | 6 +- .../multi/BlockEntityLargeBath.java | 4 +- .../multi/BlockEntityLargeBoiler.java | 14 +- .../multi/BlockEntityLargeCentrifuge.java | 4 +- .../BlockEntityLargeChemicalReactor.java | 6 +- .../multi/BlockEntityLargeElectrolyzer.java | 6 +- .../multi/BlockEntityLargeHeatExchanger.java | 6 +- .../multi/BlockEntityLargeMacerator.java | 4 +- .../multi/BlockEntityLargeOreWasher.java | 4 +- .../multi/BlockEntityLargeTank.java | 6 +- .../multi/BlockEntityLargeTurbine.java | 10 +- .../BlockEntityLongDistancePipeEndpoint.java | 10 +- .../multi/BlockEntityMultiSmelter.java | 6 +- .../multi/BlockEntityOilCrackingUnit.java | 2 +- .../multi/BlockEntityOilDrillingRig.java | 14 +- .../BlockEntityPrimitiveBlastFurnace.java | 4 +- .../multi/BlockEntityProcessingArray.java | 4 +- .../multi/BlockEntityPyrolysisOven.java | 4 +- .../multi/BlockEntityTreeGrowthSimulator.java | 4 +- .../multi/BlockEntityVacuumFreezer.java | 2 +- .../blockentity/multi/IMiningPipeTile.java | 2 +- .../multi/MiningPipeStructureCache.java | 2 +- .../single/BlockEntityAssembler.java | 8 +- .../blockentity/single/BlockEntityBath.java | 8 +- .../blockentity/single/BlockEntityBridge.java | 2 +- .../blockentity/single/BlockEntityBuffer.java | 4 +- .../single/BlockEntityCoalBoiler.java | 4 +- .../single/BlockEntityCropHarvester.java | 2 +- .../blockentity/single/BlockEntityHull.java | 2 +- .../BlockEntityIUpgradedBatchMachine.java | 4 +- .../single/BlockEntityInfiniteFluid.java | 6 +- .../single/BlockEntityInputBus.java | 2 +- .../single/BlockEntityInputHatch.java | 2 +- .../single/BlockEntityItemFilter.java | 6 +- .../single/BlockEntityLavaBoiler.java | 4 +- .../single/BlockEntityLimitedOutput.java | 4 +- .../single/BlockEntityMacerator.java | 4 +- .../single/BlockEntityNuclearReactorCore.java | 10 +- .../single/BlockEntityPrinter.java | 8 +- .../blockentity/single/BlockEntityPump.java | 2 +- .../single/BlockEntityRockBreaker.java | 2 +- .../single/BlockEntityScanner.java | 6 +- .../single/BlockEntitySecondaryOutput.java | 4 +- .../single/BlockEntitySeismicProspector.java | 8 +- .../single/BlockEntitySmallHeatExchanger.java | 6 +- .../single/BlockEntitySolarBoiler.java | 4 +- .../single/BlockEntitySolarPanel.java | 2 +- .../single/BlockEntitySteamMachine.java | 6 +- .../single/BlockEntitySteamTurbine.java | 2 +- .../single/BlockEntityTypeFilter.java | 2 +- .../single/ISteamBoilerHandler.java | 4 +- .../gt5r}/client/GT5RModelManager.java | 4 +- .../gt5r}/client/ReactorBakedModel.java | 6 +- .../gt5r}/client/ReactorModel.java | 2 +- .../gt5r}/client/ReactorModelLoader.java | 4 +- .../cover/CoverAdvancedFluidDetector.java | 4 +- .../gt5r}/cover/CoverAirVent.java | 9 +- .../gt5r}/cover/CoverConveyor.java | 6 +- .../gtreimagined/gt5r}/cover/CoverDrain.java | 4 +- .../gt5r}/cover/CoverDynamoColored.java | 4 +- .../gt5r}/cover/CoverEnergyColored.java | 4 +- .../gt5r}/cover/CoverEnergyDetector.java | 4 +- .../gt5r}/cover/CoverFluidDetector.java | 4 +- .../gt5r}/cover/CoverFluidFilter.java | 4 +- .../gt5r}/cover/CoverFluidRegulator.java | 14 +- .../gt5r}/cover/CoverItemDetector.java | 4 +- .../gt5r}/cover/CoverItemFilter.java | 6 +- .../gt5r}/cover/CoverItemRegulator.java | 6 +- .../gt5r}/cover/CoverItemRetriever.java | 4 +- .../gtreimagined/gt5r}/cover/CoverPump.java | 6 +- .../gt5r}/cover/CoverReactorOutput.java | 6 +- .../cover/CoverReactorOutputSecondary.java | 6 +- .../gt5r}/cover/CoverRobotArm.java | 6 +- .../gt5r}/cover/CoverSecondaryOutput.java | 9 +- .../gt5r}/cover/CoverShutter.java | 2 +- .../gt5r}/cover/CoverSteamVent.java | 4 +- .../gt5r}/cover/ICoverRedstoneSensitive.java | 4 +- .../gt5r}/cover/ImportExportMode.java | 2 +- .../gt5r}/cover/RedstoneMode.java | 2 +- .../gt5r}/cover/base/CoverBasicRedstone.java | 4 +- .../cover/base/CoverBasicRedstoneInput.java | 2 +- .../cover/base/CoverBasicRedstoneOutput.java | 2 +- .../gt5r}/cover/base/CoverBasicTransport.java | 15 +- .../gt5r}/cover/base/CoverFilter.java | 2 +- .../CoverActivityDetectorPossible.java | 4 +- .../CoverActivityDetectorProcessing.java | 4 +- .../CoverActivityDetectorSuccessful.java | 4 +- .../cover/redstone/CoverNeedsMaintenance.java | 8 +- .../cover/redstone/CoverProgressSensor.java | 4 +- .../CoverRedstoneConductorAccept.java | 4 +- .../redstone/CoverRedstoneConductorEmit.java | 4 +- .../CoverRedstoneMachineController.java | 4 +- .../gtreimagined/gt5r}/data/ClientData.java | 10 +- .../gtreimagined/gt5r}/data/GT5RBlocks.java | 187 ++- .../gtreimagined/gt5r}/data/GT5RCovers.java | 20 +- .../gtreimagined/gt5r}/data/GT5RData.java | 2 +- .../gtreimagined/gt5r}/data/GT5RItems.java | 93 +- .../gt5r/data/GT5RMaterialEvents.java | 1487 ++++++++++++++++ .../gt5r}/data/GT5RMaterialTags.java | 4 +- .../gt5r}/data/GT5RMaterialTypes.java | 2 +- .../gtreimagined/gt5r}/data/GT5RSounds.java | 4 +- .../gtreimagined/gt5r}/data/GT5RTags.java | 4 +- .../gtreimagined/gt5r}/data/Guis.java | 11 +- .../gtreimagined/gt5r}/data/Machines.java | 121 +- .../gtreimagined/gt5r}/data/Materials.java | 4 +- .../gtreimagined/gt5r}/data/MenuHandlers.java | 6 +- .../gtreimagined/gt5r}/data/Models.java | 2 +- .../gtreimagined/gt5r}/data/RecipeMaps.java | 40 +- .../gt5r}/data/StructureInfo.java | 4 +- .../gtreimagined/gt5r}/data/Structures.java | 15 +- .../gtreimagined/gt5r}/data/Textures.java | 4 +- .../gtreimagined/gt5r}/data/TierMaps.java | 61 +- .../gtreimagined/gt5r}/data/ToolTypes.java | 10 +- .../gt5r}/datagen/GT5RBlockLootProvider.java | 21 +- .../gt5r}/datagen/GT5RBlockTagProvider.java | 21 +- .../gt5r}/datagen/GT5RFluidTagProvider.java | 4 +- .../gt5r}/datagen/GT5RItemTagProvider.java | 8 +- .../gt5r}/datagen/GT5RLocalizations.java | 27 +- .../gt5r}/datagen/GT5RTwilightStalctites.java | 4 +- .../MultiBlocks_tooltips_-_In_Progress.txt | 0 .../datagen/ProgressionAdvancements.java | 8 +- .../gt5r}/gui/ButtonOverlays.java | 4 +- .../gt5r}/gui/ScreenCoalBoiler.java | 4 +- .../gt5r}/gui/ScreenFusionReactor.java | 4 +- .../gt5r}/gui/ScreenSteamMachine.java | 4 +- .../gui/widgets/CoalBoilerFuelWidget.java | 4 +- .../gt5r}/gui/widgets/CoalBoilerWidget.java | 4 +- .../gt5r}/gui/widgets/FusionButtonWidget.java | 6 +- .../gt5r}/gui/widgets/LavaBoilerWidget.java | 4 +- .../gt5r}/gui/widgets/SolarBoilerWidget.java | 4 +- .../AppliedEnergisticsRegistrar.java | 10 +- .../gt5r}/integration/ForestryRegistrar.java | 0 .../integration/GalacticraftRegistrar.java | 0 .../integration/IC2ClassicRegistrar.java | 2 +- .../gt5r}/integration/IC2Registrar.java | 0 .../gt5r}/integration/SpaceModRegistrar.java | 4 +- .../UndergroundBiomesRegistrar.java | 0 .../integration/rei/MaterialTreeCategory.java | 4 +- .../integration/rei/MaterialTreeDisplay.java | 2 +- .../rei/OreProcessingCategory.java | 10 +- .../integration/rei/OreProcessingDisplay.java | 4 +- .../gt5r}/integration/rei/REIRegistrar.java | 6 +- .../gt5r}/items/ICoverTooltipInfo.java | 2 +- .../gt5r}/items/IItemReactorRod.java | 4 +- .../gt5r}/items/ItemBreederRod.java | 6 +- .../gt5r}/items/ItemComponentRod.java | 8 +- .../gt5r}/items/ItemCoverCustomTooltip.java | 2 +- .../gt5r}/items/ItemDataStick.java | 2 +- .../gt5r}/items/ItemDepletedRod.java | 6 +- .../gt5r}/items/ItemEnrichedRod.java | 6 +- .../gt5r}/items/ItemNuclearFuelRod.java | 53 +- .../gt5r}/items/ItemPortableScanner.java | 4 +- .../gt5r}/items/ItemPowerUnit.java | 2 +- .../gt5r}/items/ItemPrintedPages.java | 2 +- .../gt5r}/items/ItemSprayCan.java | 8 +- .../gt5r}/items/ItemTurbineRotor.java | 15 +- .../gt5r/loader/SimpleMachineLoader.java | 2 + .../gt5r}/loader/WorldGenLoader.java | 10 +- .../gt5r}/loader/crafting/BlockParts.java | 23 +- .../loader/crafting/ElectricToolRecipes.java | 10 +- .../gt5r}/loader/crafting/MachineRecipes.java | 26 +- .../loader/crafting/MaterialCrafting.java | 10 +- .../gt5r}/loader/crafting/Miscellaneous.java | 4 +- .../gt5r}/loader/crafting/Parts.java | 18 +- .../gt5r}/loader/crafting/Smelting.java | 10 +- .../gt5r}/loader/crafting/SteamMachines.java | 10 +- .../loader/crafting/VanillaExtensions.java | 6 +- .../loader/crafting/WireCablesPlates.java | 6 +- .../gt5r}/loader/crafting/WoodCrafting.java | 6 +- .../gt5r}/loader/items/Circuitry.java | 22 +- .../loader/machines/AlloySmelterLoader.java | 8 +- .../loader/machines/ArcFurnaceLoader.java | 22 +- .../loader/machines/AssemblerLoader.java | 30 +- .../loader/machines/AutoclaveLoader.java | 14 +- .../gt5r}/loader/machines/BathLoader.java | 18 +- .../gt5r}/loader/machines/BenderLoader.java | 10 +- .../gt5r}/loader/machines/CannerLoader.java | 14 +- .../loader/machines/CentrifugeLoader.java | 14 +- .../machines/ChemicalReactorLoader.java | 10 +- .../loader/machines/CompressorLoader.java | 6 +- .../CrystallizationChamberLoader.java | 8 +- .../gt5r}/loader/machines/CutterLoader.java | 8 +- .../loader/machines/DehydratorLoader.java | 8 +- .../loader/machines/DistilleryLoader.java | 2 +- .../loader/machines/ElectrolyzerLoader.java | 14 +- .../ElectromagneticSeparatorLoader.java | 8 +- .../loader/machines/ExtractorLoader.java | 7 +- .../gt5r}/loader/machines/ExtruderLoader.java | 14 +- .../gt5r/loader/machines/FermenterLoader.java | 11 + .../loader/machines/FluidCannerLoader.java | 10 +- .../loader/machines/FluidHeaterLoader.java | 6 +- .../loader/machines/FluidPressLoader.java | 6 +- .../machines/FluidSolidifierLoader.java | 6 +- .../loader/machines/ForgeHammerLoader.java | 12 +- .../loader/machines/FormingPressLoader.java | 4 +- .../loader/machines/LaserEngraverLoader.java | 8 +- .../gt5r}/loader/machines/LatheLoader.java | 6 +- .../loader/machines/MaceratorLoader.java | 10 +- .../gt5r}/loader/machines/MixerLoader.java | 14 +- .../gt5r}/loader/machines/OreByproducts.java | 4 +- .../loader/machines/OreWasherLoader.java | 4 +- .../gt5r}/loader/machines/PackagerLoader.java | 4 +- .../loader/machines/PolarizerLoader.java | 6 +- .../gt5r}/loader/machines/PrinterLoader.java | 8 +- .../gt5r}/loader/machines/RoasterLoader.java | 6 +- .../loader/machines/RockBreakerLoader.java | 4 +- .../gt5r}/loader/machines/ScannerLoader.java | 6 +- .../gt5r}/loader/machines/SifterLoader.java | 4 +- .../gt5r}/loader/machines/SmelterLoader.java | 10 +- .../machines/ThermalCentrifugeLoader.java | 6 +- .../gt5r}/loader/machines/UUMatterLoader.java | 8 +- .../loader/machines/UnpackagerLoader.java | 4 +- .../gt5r}/loader/machines/WiremillLoader.java | 12 +- .../loader/machines/generator/Fuels.java | 12 +- .../machines/generator/LargeBoilerLoader.java | 6 +- .../generator/SolidFuelBoilerLoader.java | 6 +- .../loader/multi/BlastFurnaceLoader.java | 14 +- .../gt5r}/loader/multi/CokeOvenLoader.java | 6 +- .../loader/multi/CrackingUnitLoader.java | 6 +- .../loader/multi/DistillationTowerLoader.java | 10 +- .../loader/multi/FusionReactorLoader.java | 6 +- .../loader/multi/HeatExchangerLoader.java | 6 +- .../multi/ImplosionCompressorLoader.java | 8 +- .../loader/multi/PyrolysisOvenLoader.java | 10 +- .../multi/TreeGrowthSimulatorLoader.java | 4 +- .../loader/multi/VacuumFreezerLoader.java | 6 +- .../machine/ISecondaryOutputMachine.java | 2 +- .../gt5r}/machine/MiniPortalMachine.java | 6 +- .../gt5r}/machine/MultiblockTankMachine.java | 6 +- .../gt5r}/machine/SecondaryOutputMachine.java | 4 +- .../gt5r}/machine/SteamMachine.java | 6 +- .../machine/caps/ParallelRecipeHandler.java | 2 +- .../caps/SecondaryOutputCoverHandler.java | 4 +- .../gt5r}/machine/maps/DisassemblingMap.java | 2 +- .../gt5r}/material/FluidProduct.java | 2 +- .../gt5r}/material/GregTechMaterialEvent.java | 4 +- .../gt5r}/proxy/ClientHandler.java | 12 +- .../gt5r}/proxy/CommonHandler.java | 2 +- .../gt5r}/worldgen/OilSpoutEntry.java | 2 +- .../gt5r}/worldgen/OilSpoutFluid.java | 2 +- .../gt5r}/worldgen/OilSpoutSavedData.java | 2 +- .../gt5r}/client/fabric/GT5RFabricClient.java | 4 +- .../gtreimagined/gt5r}/fabric/GT5RFabric.java | 10 +- .../gt5r}/events/forge/RemappingEvents.java | 10 +- .../gtreimagined/gt5r}/forge/GT5RForge.java | 16 +- .../integration/forge/tfc/MachineRecipes.java | 11 +- .../integration/forge/tfc/TFCRegistrar.java | 11 +- .../tfc/datagen/TFCBlockTagProvider.java | 2 +- .../forge/tfc/datagen/TFCItemTagProvider.java | 3 +- .../forge/tfc/datagen/TFCLangProvider.java | 7 +- .../forge/tfc/ore/GTTFCOreBlock.java | 4 +- .../forge/tfc/ore/GTTFCOreItem.java | 2 +- 282 files changed, 2655 insertions(+), 2614 deletions(-) delete mode 100644 common/src/main/java/muramasa/gregtech/data/GT5RMaterialEvents.java delete mode 100644 common/src/main/java/muramasa/gregtech/loader/SimpleMachineLoader.java delete mode 100644 common/src/main/java/muramasa/gregtech/loader/machines/FermenterLoader.java rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/GT5RConfig.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/GT5RPostRegistrar.java (87%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/GT5RRef.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/GT5Reimagined.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/GTRemapping.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockAsphalt.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockAsphaltSlab.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockAsphaltStair.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockCasing.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockCoil.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockColoredWall.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockFakeCasing.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockMiningPipe.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockPowderBarrel.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/block/BlockSidedCasing.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/miniportals/BlockEntityMiniEndPortal.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/miniportals/BlockEntityMiniNetherPortal.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/miniportals/BlockEntityMiniPortal.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/miniportals/BlockEntityMiniTwilightPortal.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityAdvancedMiner.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityCharcoalPit.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityCokeOven.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityCombustionEngine.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityDistillationTower.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityElectricBlastFurnace.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityFusionReactor.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityImplosionCompressor.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeAutoclave.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeBath.java (81%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeBoiler.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeCentrifuge.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeChemicalReactor.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeElectrolyzer.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeHeatExchanger.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeMacerator.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeOreWasher.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeTank.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLargeTurbine.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityMultiSmelter.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityOilCrackingUnit.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityOilDrillingRig.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityPrimitiveBlastFurnace.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityProcessingArray.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityPyrolysisOven.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityTreeGrowthSimulator.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/BlockEntityVacuumFreezer.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/IMiningPipeTile.java (72%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/multi/MiningPipeStructureCache.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityAssembler.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityBath.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityBridge.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityBuffer.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityCoalBoiler.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityCropHarvester.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityHull.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityIUpgradedBatchMachine.java (89%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityInfiniteFluid.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityInputBus.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityInputHatch.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityItemFilter.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityLavaBoiler.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityLimitedOutput.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityMacerator.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityNuclearReactorCore.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityPrinter.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityPump.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityRockBreaker.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityScanner.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntitySecondaryOutput.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntitySeismicProspector.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntitySmallHeatExchanger.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntitySolarBoiler.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntitySolarPanel.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntitySteamMachine.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntitySteamTurbine.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/BlockEntityTypeFilter.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/blockentity/single/ISteamBoilerHandler.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/client/GT5RModelManager.java (78%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/client/ReactorBakedModel.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/client/ReactorModel.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/client/ReactorModelLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverAdvancedFluidDetector.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverAirVent.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverConveyor.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverDrain.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverDynamoColored.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverEnergyColored.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverEnergyDetector.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverFluidDetector.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverFluidFilter.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverFluidRegulator.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverItemDetector.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverItemFilter.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverItemRegulator.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverItemRetriever.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverPump.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverReactorOutput.java (86%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverReactorOutputSecondary.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverRobotArm.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverSecondaryOutput.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverShutter.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/CoverSteamVent.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/ICoverRedstoneSensitive.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/ImportExportMode.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/RedstoneMode.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/base/CoverBasicRedstone.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/base/CoverBasicRedstoneInput.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/base/CoverBasicRedstoneOutput.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/base/CoverBasicTransport.java (89%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/base/CoverFilter.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverActivityDetectorPossible.java (82%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverActivityDetectorProcessing.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverActivityDetectorSuccessful.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverNeedsMaintenance.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverProgressSensor.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverRedstoneConductorAccept.java (89%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverRedstoneConductorEmit.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/cover/redstone/CoverRedstoneMachineController.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/ClientData.java (82%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RBlocks.java (75%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RCovers.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RData.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RItems.java (80%) create mode 100644 common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RMaterialTags.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RMaterialTypes.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RSounds.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/GT5RTags.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/Guis.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/Machines.java (81%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/Materials.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/MenuHandlers.java (88%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/Models.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/RecipeMaps.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/StructureInfo.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/Structures.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/Textures.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/TierMaps.java (86%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/data/ToolTypes.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/GT5RBlockLootProvider.java (85%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/GT5RBlockTagProvider.java (79%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/GT5RFluidTagProvider.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/GT5RItemTagProvider.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/GT5RLocalizations.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/GT5RTwilightStalctites.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/MultiBlocks_tooltips_-_In_Progress.txt (100%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/datagen/ProgressionAdvancements.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/ButtonOverlays.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/ScreenCoalBoiler.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/ScreenFusionReactor.java (85%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/ScreenSteamMachine.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/widgets/CoalBoilerFuelWidget.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/widgets/CoalBoilerWidget.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/widgets/FusionButtonWidget.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/widgets/LavaBoilerWidget.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/gui/widgets/SolarBoilerWidget.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/AppliedEnergisticsRegistrar.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/ForestryRegistrar.java (100%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/GalacticraftRegistrar.java (100%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/IC2ClassicRegistrar.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/IC2Registrar.java (100%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/SpaceModRegistrar.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/UndergroundBiomesRegistrar.java (100%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/rei/MaterialTreeCategory.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/rei/MaterialTreeDisplay.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/rei/OreProcessingCategory.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/rei/OreProcessingDisplay.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/rei/REIRegistrar.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ICoverTooltipInfo.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/IItemReactorRod.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemBreederRod.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemComponentRod.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemCoverCustomTooltip.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemDataStick.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemDepletedRod.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemEnrichedRod.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemNuclearFuelRod.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemPortableScanner.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemPowerUnit.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemPrintedPages.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemSprayCan.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/items/ItemTurbineRotor.java (86%) create mode 100644 common/src/main/java/org/gtreimagined/gt5r/loader/SimpleMachineLoader.java rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/WorldGenLoader.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/BlockParts.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/ElectricToolRecipes.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/MachineRecipes.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/MaterialCrafting.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/Miscellaneous.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/Parts.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/Smelting.java (89%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/SteamMachines.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/VanillaExtensions.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/WireCablesPlates.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/crafting/WoodCrafting.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/items/Circuitry.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/AlloySmelterLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ArcFurnaceLoader.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/AssemblerLoader.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/AutoclaveLoader.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/BathLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/BenderLoader.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/CannerLoader.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/CentrifugeLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ChemicalReactorLoader.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/CompressorLoader.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/CrystallizationChamberLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/CutterLoader.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/DehydratorLoader.java (79%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/DistilleryLoader.java (60%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ElectrolyzerLoader.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ElectromagneticSeparatorLoader.java (85%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ExtractorLoader.java (89%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ExtruderLoader.java (97%) create mode 100644 common/src/main/java/org/gtreimagined/gt5r/loader/machines/FermenterLoader.java rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/FluidCannerLoader.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/FluidHeaterLoader.java (73%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/FluidPressLoader.java (88%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/FluidSolidifierLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ForgeHammerLoader.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/FormingPressLoader.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/LaserEngraverLoader.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/LatheLoader.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/MaceratorLoader.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/MixerLoader.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/OreByproducts.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/OreWasherLoader.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/PackagerLoader.java (88%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/PolarizerLoader.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/PrinterLoader.java (78%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/RoasterLoader.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/RockBreakerLoader.java (77%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ScannerLoader.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/SifterLoader.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/SmelterLoader.java (93%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/ThermalCentrifugeLoader.java (89%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/UUMatterLoader.java (87%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/UnpackagerLoader.java (87%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/WiremillLoader.java (86%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/generator/Fuels.java (78%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/generator/LargeBoilerLoader.java (86%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/machines/generator/SolidFuelBoilerLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/BlastFurnaceLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/CokeOvenLoader.java (92%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/CrackingUnitLoader.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/DistillationTowerLoader.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/FusionReactorLoader.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/HeatExchangerLoader.java (91%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/ImplosionCompressorLoader.java (82%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/PyrolysisOvenLoader.java (94%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/TreeGrowthSimulatorLoader.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/loader/multi/VacuumFreezerLoader.java (81%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/ISecondaryOutputMachine.java (77%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/MiniPortalMachine.java (87%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/MultiblockTankMachine.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/SecondaryOutputMachine.java (86%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/SteamMachine.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/caps/ParallelRecipeHandler.java (99%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/caps/SecondaryOutputCoverHandler.java (95%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/machine/maps/DisassemblingMap.java (98%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/material/FluidProduct.java (90%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/material/GregTechMaterialEvent.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/proxy/ClientHandler.java (88%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/proxy/CommonHandler.java (65%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/worldgen/OilSpoutEntry.java (97%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/worldgen/OilSpoutFluid.java (96%) rename common/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/worldgen/OilSpoutSavedData.java (99%) rename fabric/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/client/fabric/GT5RFabricClient.java (71%) rename fabric/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/fabric/GT5RFabric.java (93%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/events/forge/RemappingEvents.java (98%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/forge/GT5RForge.java (83%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/forge/tfc/MachineRecipes.java (95%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/forge/tfc/TFCRegistrar.java (96%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/forge/tfc/datagen/TFCBlockTagProvider.java (97%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/forge/tfc/datagen/TFCItemTagProvider.java (96%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/forge/tfc/datagen/TFCLangProvider.java (76%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/forge/tfc/ore/GTTFCOreBlock.java (94%) rename forge/src/main/java/{muramasa/gregtech => org/gtreimagined/gt5r}/integration/forge/tfc/ore/GTTFCOreItem.java (86%) diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RMaterialEvents.java b/common/src/main/java/muramasa/gregtech/data/GT5RMaterialEvents.java deleted file mode 100644 index 71f74db04..000000000 --- a/common/src/main/java/muramasa/gregtech/data/GT5RMaterialEvents.java +++ /dev/null @@ -1,1491 +0,0 @@ -package muramasa.gregtech.data; - -import muramasa.antimatter.Data; -import muramasa.antimatter.data.AntimatterDefaultTools; -import muramasa.antimatter.data.AntimatterMaterials; -import muramasa.antimatter.material.Material; -import muramasa.antimatter.material.MaterialTags; -import muramasa.antimatter.material.SubTag; -import muramasa.gregtech.material.GregTechMaterialEvent; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.enchantment.Enchantments; -import org.gtreimagined.gtcore.data.GTCoreBlocks; -import org.gtreimagined.gtcore.data.GTCoreMaterials; - -import java.util.List; - -import static com.google.common.collect.ImmutableMap.of; -import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.antimatter.material.MaterialTags.*; -import static muramasa.gregtech.data.GT5RMaterialTags.*; -import static muramasa.gregtech.data.GT5RMaterialTypes.BOULE; -import static muramasa.gregtech.data.GT5RMaterialTypes.CHAMBER; -import static muramasa.gregtech.data.Materials.*; - -public class GT5RMaterialEvents { - public static void onMaterialEvent(GregTechMaterialEvent event){ - flags(event); - antimatterMaterials(event); - byproducts(event); - /** - *** Periodic Table of Elements (No Isotopes) - **/ - event.setMaterial(Hydrogen).asGas(20).fluidDensity(-1112); - event.setMaterial(Helium).asGas().fluidDensity(-560); - event.setMaterial(Lithium).asSolid(454, 0, BOLT, MOLTEN).asOre().harvestLevel(2); - event.setMaterial(Beryllium).asSolid(1560).asOre(); - event.setMaterial(Boron).asDust(2349); - event.setMaterial(Carbon).asDust(PLATE, MOLTEN).asFluid(); - event.setMaterial(Nitrogen).asGas().asFluid(0, 77); - event.setMaterial(Oxygen).asGas(); - event.setMaterial(Fluorine).asGas(); - event.setMaterial(Neon).asGas().fluidDensity(-111); - event.setMaterial(Sodium).asDust(370, MOLTEN).asFluid(); - event.setMaterial(Magnesium).asMetal(1383); - event.setMaterial(Aluminium).asMetal(933, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, FOIL, HAS_CUSTOM_SMELTING); - event.setMaterial(Silicon).asMetal(1687, PLATE, FOIL, BOULE); - event.setMaterial(Phosphor).asDust(933); - event.setMaterial(Sulfur).asDust(388, MOLTEN).asOre().harvestLevel(2).asFluid(); - event.setMaterial(Chlorine).asGas().fluidDensity(3); - event.setMaterial(Argon).asGas(); - event.setMaterial(Potassium).asSolid(337, MOLTEN); - event.setMaterial(Calcium).asDust(1115); - //Scandium, not added - event.setMaterial(Titanium).asMetal(1941, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, ROTOR, SPRING).forceBF(true); - event.setMaterial(Vanadium).asMetal(2183, INGOT_HOT); - event.setMaterial(Chromium).asMetal(2180, 1700, SCREW, BOLT, RING, PLATE, ROTOR).forceBF(false); - event.setMaterial(Manganese).asMetal(1519, FOIL).asOre(); - //Iron, added by vanilla - event.setMaterial(Cobalt).asMetal(1768, CRUSHED); - event.setMaterial(Nickel).asMetal(1728, PLATE).asOre(); - //Copper, by vanilla - event.setMaterial(Zinc).asMetal(692, PLATE, FOIL).asOre(); - event.setMaterial(Gallium).asMetal(303, MOLTEN); - event.setMaterial(Germanium).asMetal(1211); - event.setMaterial(Arsenic).asMetal(1090); - //event.setMaterial(Selenium).asMetal(494, 0); - //Bromine, not added - event.setMaterial(Krypton).asGas().fluidDensity(3); - //rubidium, strontium - event.setMaterial(Yttrium).asMetal(1799); - event.setMaterial(Zirconium).asMetal(2130).forceBF(true); - event.setMaterial(Niobium).asMetal(2750, GEAR); - event.setMaterial(Molybdenum).asMetal(2896).asOre(); - event.setMaterial(Technetium).asMetal(2430); - //event.setMaterial(Ruthenium).asMetal(2607,2607); - //event.setMaterial(Rhodium).asMetal(2237, 2237); - event.setMaterial(Palladium).asMetal(1828).forceBF(true); - event.setMaterial(Silver).asMetal(1234, PLATE, SCREW).asOre().harvestLevel(2); - event.setMaterial(Cadmium).asDust(594); - event.setMaterial(Indium).asSolid(430, MOLTEN); - event.setMaterial(Tin).asMetal(505, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FOIL, WIRE_FINE, FRAME, ROTOR).asOre().harvestLevel(1); - event.setMaterial(Antimony).asMetal(1449); - //Tellurium - event.setMaterial(Iodine).asSolid(387); - event.setMaterial(Xenon).asGas().fluidDensity(5); - event.setMaterial(Caesium).asMetal(301); - event.setMaterial(Barium).asDust(1000); - //Lanthanum - event.setMaterial(Cerium).asDust(); - //Praseodymium - event.setMaterial(Neodymium).asMetal(1297, PLATE, ROD_LONG).asOre().harvestLevel(2); // TODO: Bastnasite or Monazite for Ore For; - event.setMaterial(Promethium).asMetal(1353); - //Samarium - event.setMaterial(Europium).asMetal(1099, PLATE); - event.setMaterial(Gadolinium).asMetal(1585); - event.setMaterial(Terbium).asMetal(1696); - //dysprosium, holmium, erbium, thulium, ytterbium, lutetium - event.setMaterial(Hafnium).asMetal(2506); - event.setMaterial(Tantalum).asSolid(3290); - event.setMaterial(Tungsten).asMetal(3695, 3000, FOIL, RING, FRAME); - //event.setMaterial(Rhenium).asMetal(3459,3459); - event.setMaterial(Osmium).asOre().asMetal(3306, SCREW, BOLT, RING, PLATE, FOIL, ROD_LONG, WIRE_FINE); - event.setMaterial(Iridium).asMetal(2719, FRAME, PLATE, CHAMBER).asOre(); - event.setMaterial(Platinum).asMetal(2041, 0, PLATE, FOIL, ROD_LONG, WIRE_FINE, FRAME).asOre(); - //Gold, added by vanilla - event.setMaterial(Mercury).asFluid(); - // thalium - event.setMaterial(Lead).asMetal(600, PLATE, PLATE_DENSE, FOIL, ROD_LONG, FRAME, BOLT, RING).asOre().harvestLevel(1); - event.setMaterial(Bismuth).asOre(); - //polonium - //event.setMaterial(Astatine).asMetal(575, 0); - event.setMaterial(Radon).asGas().fluidDensity(9); - //event.setMaterial(Francium).asMetal(298, 0); - //event.setMaterial(Radium).asMetal(973, 0); - //event.setMaterial(Actinium).asMetal(1323, 0); - event.setMaterial(Thorium).asMetal(2115, 0, PLATE_DENSE).asOre(); - //protactinium - event.setMaterial(Uranium).asMetal(1405).harvestLevel(2); - //event.setMaterial(Neptunium).asMetal(912, 0); - event.setMaterial(Plutonium).asMetal(912); - event.setMaterial(Americium).asMetal(1149, ROD_LONG); - //Elements 96 - 118 not added - /** - *** Solids - **/ - /** - ** Metals - **/ - event.setMaterial(AnnealedCopper).asMetal(1357, PLATE, FOIL, ROD_LONG, WIRE_FINE, SCREW); - event.setMaterial(BatteryAlloy).asMetal(295, PLATE); - event.setMaterial(BismuthBronze).asMetal(1100, PLATE); - event.setMaterial(BlackBronze).asMetal(2000, FRAME); - event.setMaterial(BlackSteel).asMetal(1200, 1200, FRAME, PLATE).forceBF(false); - event.setMaterial(BlueSteel).asMetal(1400, 1400, FRAME).forceBF(false); - event.setMaterial(Brass).asMetal(1170, FRAME, ROD_LONG, PLATE, GEAR_SMALL); - event.setMaterial(Bronze).asMetal(1125, GEAR, FRAME, ROTOR); - event.setMaterial(CdInAGAlloy).asMetal(752, ROD); - event.setMaterial(CobaltBrass).asMetal(1500, GEAR); - event.setMaterial(Cupronickel).asMetal(1728, PLATE); - event.setMaterial(Duranium).asMetal(295, MOLTEN); - event.setMaterial(Electrum).asMetal(1330, PLATE, FOIL, ROD_LONG, WIRE_FINE); - event.setMaterial(EnrichedNaquadah).asMetal(4500, 4500, POSITIVE_CHANGING_RGB); - event.setMaterial(HSSE).asMetal(5400, 5400, GEAR, FRAME); - event.setMaterial(HSSG).asMetal(4500, 4500, GEAR, FRAME); - event.setMaterial(HSSS).asMetal(5400, 5400); - event.setMaterial(Invar).asMetal(1700, FRAME, RING); - event.setMaterial(IronMagnetic).asMetal(1811, ROD_LONG); - event.setMaterial(Kanthal).asMetal(1800).forceBF(true); - event.setMaterial(Magnalium).asMetal(870, PLATE, ROD_LONG); - event.setMaterial(NeodymiumMagnetic).asMetal(1297, ROD_LONG); - event.setMaterial(Neutronium).asMetal(10000, 10000, SCREW, BOLT, RING, GEAR, FRAME); - event.setMaterial(Naquadah).asMetal(5400, 5400).asOre(); - event.setMaterial(NaquadahAlloy).asMetal(7200, 7200); - event.setMaterial(Naquadria).asMetal(9000, 9000, POSITIVE_CHANGING_RGB); - event.setMaterial(Nichrome).asMetal(2700, 2700); - event.setMaterial(NickelZincFerrite).asMetal(1500, 1500); - event.setMaterial(NiobiumTitanium).asMetal(4500, 4500, PLATE, FOIL, ROD_LONG, WIRE_FINE, GEAR); - event.setMaterial(Osmiridium).asMetal(3333, 2500, FRAME); - event.setMaterial(RedAlloy).asMetal(295, PLATE, FOIL, ROD_LONG, WIRE_FINE); - event.setMaterial(RedSteel).asMetal(1300, 1300).forceBF(false); - event.setMaterial(RoseGold).asMetal(1600, WIRE_FINE); - event.setMaterial(SolderingAlloy).asMetal(400, PLATE, FOIL, ROD_LONG, WIRE_FINE); - event.setMaterial(Steel).asMetal(1811, 1000, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL, ITEM_CASING, WIRE_FINE).forceBF(false); - event.setMaterial(SteelMagnetic).asMetal(1000, 1000, ROD_LONG).forceBF(false); - event.setMaterial(SterlingSilver).asMetal(1700); - event.setMaterial(StainlessSteel).asMetal(1700, 1700, PLATE, PLATE_DENSE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL, ITEM_CASING).forceBF(false); - event.setMaterial(TinAlloy).asMetal(1158); - event.setMaterial(Tritanium).asMetal(295, FRAME, MOLTEN); - event.setMaterial(TungstenCarbide).asMetal(2460, 2460); - event.setMaterial(TungstenSteel).asMetal(3000, 3000, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL); - event.setMaterial(Ultimet).asMetal(2700, 2700, PLATE); - event.setMaterial(VanadiumGallium).asMetal(4500, 4500, ROD_LONG, PLATE); - event.setMaterial(VanadiumSteel).asMetal(1453, 1453).forceBF(false); - event.setMaterial(Vibranium).asMetal(295, FRAME); - event.setMaterial(WroughtIron).asMetal(1811, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL); - event.setMaterial(YttriumBariumCuprate).asMetal(4500, 4500, PLATE, FOIL, ROD_LONG, WIRE_FINE); - /** - ** Dusts - **/ - /** - * Organic - **/ - event.setMaterial(Ash).asDust(); - event.setMaterial(AntimonyTrioxide).asDust(); - event.setMaterial(Clay).asDust(); - event.setMaterial(CupricOxide).asDust(); - event.setMaterial(DarkAsh).asDust(); - event.setMaterial(Dibenzene).asDust(); - event.setMaterial(DibenzoylPeroxide).asDust(); - event.setMaterial(GelledToluene).asDust(); - event.setMaterial(Graphene).asDust(PLATE, WIRE_FINE); - event.setMaterial(Polydimethylsiloxane).asDust(); - event.setMaterial(RareEarth).asDust(); - event.setMaterial(RawRubber).asDust(RUBBERTOOLS); - event.setMaterial(RawStyreneButadieneRubber).asDust(RUBBERTOOLS); - event.setMaterial(SodaAsh).asDust(); - event.setMaterial(Wood).asDust(GEAR); - /** - * Inorganic - **/ - event.setMaterial(AluminiumHydroxide).asDust(); - event.setMaterial(AluminiumTrichloride).asDust(); - event.setMaterial(Aluminosilicate).asDust(); - event.setMaterial(AmmoniumChloride).asDust(); - event.setMaterial(ArsenicTrioxide).asDust(); - event.setMaterial(Biotite).asDust(); - event.setMaterial(Bitumen).asDust().asFluid(0, 1000).flags(MOLTEN); - event.setMaterial(BlackGranite).asDust(ROCK); - event.setMaterial(BlueSchist).asDust(ROCK); - event.setMaterial(BorosilicateGlass).asDust(); - event.setMaterial(Brick).asDust(); - event.setMaterial(CalciumChloride).asDust(); - event.setMaterial(CalciumSulfate).asDust(); - event.setMaterial(CobaltOxide).asDust(); - event.setMaterial(Concrete).asDust(300); - event.setMaterial(DialuminiumTrioxide).asDust(); - event.setMaterial(Energium).asDust(); - event.setMaterial(FerricChloride).asDust(); - event.setMaterial(FerriteMixture).asDust(); - event.setMaterial(Ferrosilite).asDust(); - event.setMaterial(Fireclay).asDust(); - event.setMaterial(Fluorite).asDust(); - event.setMaterial(GreenSchist).asDust(ROCK); - event.setMaterial(IndiumGalliumPhosphide).asSolid(349, PLATE, MOLTEN); - event.setMaterial(IridiumSodiumOxide).asDust(); - event.setMaterial(Kimberlite).asDust(ROCK); - event.setMaterial(Komatiite).asDust(ROCK); - event.setMaterial(Lapotronium).asFluid(); - event.setMaterial(Limestone).asDust(ROCK); - event.setMaterial(LithiumChloride).asSolid(880, MOLTEN); - event.setMaterial(MagnesiumCarbonate).asDust(); - event.setMaterial(MagnesiumChloride).asDust(); - event.setMaterial(Marble).asDust(ROCK); - event.setMaterial(Massicot).asDust(); - event.setMaterial(Obsidian).asDust(ROD_LONG, PLATE); - event.setMaterial(PlatinumGroupSludge).asDust(); - event.setMaterial(PhosphorousPentoxide).asDust(); - event.setMaterial(PotassiumBisulfate).asDust(); - event.setMaterial(PotassiumFeldspar).asDust(); - event.setMaterial(Powellite).asOre(1, 5, true).harvestLevel(2); - //event.setMaterial(Pyrochlore).asDust(ORE).addComposition(of(Calcium, 2, Niobium, 2, Oxygen, 7)); - event.setMaterial(Quartzite).asDust(ROCK); - event.setMaterial(Quicklime).asDust(); - event.setMaterial(ReactionCatalyst).asDust(); - event.setMaterial(RedGranite).asDust(ROCK); - event.setMaterial(SiliconDioxide).asDust(); - event.setMaterial(Shale).asDust(ROCK); - event.setMaterial(Slate).asDust(ROCK); - event.setMaterial(SodiumAluminate).asDust(); - event.setMaterial(SodiumBisulfate).asDust(); - event.setMaterial(SodiumPersulfate).asDust(); - event.setMaterial(SodiumHydroxide).asDust(); - event.setMaterial(SodiumSulfate).asDust(); - event.setMaterial(SodiumSulfide).asDust(); - event.setMaterial(TungsticAcid).asDust(); - event.setMaterial(TungstenTrioxide).asDust(); - event.setMaterial(Wollastonite).asDust(); - //Nuclear - - /** - ** Ores - **/ - event.setMaterial(Almandine).asOre().harvestLevel(1); - event.setMaterial(Alumina).asOre().asSolid(2345, MOLTEN); - event.setMaterial(Andradite).asOre(); - event.setMaterial(Hematite).asOre().harvestLevel(2); - event.setMaterial(Bastnasite).asOre().harvestLevel(2); - event.setMaterial(Barite).asOre().harvestLevel(2); - event.setMaterial(Bentonite).asOre(); // TODO: Ore Gen - event.setMaterial(BrownLimonite).asOre().harvestLevel(1); - event.setMaterial(Calcite).asOre(MOLTEN).asFluid(0, 1612).harvestLevel(1); - event.setMaterial(Cassiterite).asOre().harvestLevel(1); - event.setMaterial(Chalcopyrite).asOre().harvestLevel(1); - event.setMaterial(Cinnabar).asOre().harvestLevel(1); - event.setMaterial(Chromite).asOre().harvestLevel(2); - event.setMaterial(Cobaltite).asOre().harvestLevel(2); - event.setMaterial(Sheldonite).asOre().harvestLevel(2); - event.setMaterial(Galena).asOre().harvestLevel(3); - event.setMaterial(Garnierite).asOre().harvestLevel(3); - event.setMaterial(Glauconite).asOre().harvestLevel(2); // TODO: Ore Gen; - event.setMaterial(Graphite).asDust(ROD).asOre().harvestLevel(2); - event.setMaterial(Grossular).asOre().harvestLevel(1); - event.setMaterial(Ilmenite).asOre().harvestLevel(3); - event.setMaterial(Lepidolite).asOre().harvestLevel(2); // TODO: Ore Gen; - event.setMaterial(Rutile).asOre(); - event.setMaterial(Magnesite).asOre().harvestLevel(2); - event.setMaterial(Magnetite).asOre().harvestLevel(2); - event.setMaterial(Malachite).asOre().harvestLevel(2); - event.setMaterial(Molybdenite).asOre().harvestLevel(2); - event.setMaterial(Pentlandite).asOre().harvestLevel(2); - event.setMaterial(Phosphate).asOre().harvestLevel(1); - event.setMaterial(Pitchblende).asOre(); - event.setMaterial(Pyrite).asOre().harvestLevel(1); - event.setMaterial(Pyrolusite).asOre().harvestLevel(2); - event.setMaterial(Pyrope).asOre().harvestLevel(2); - event.setMaterial(Saltpeter).asOre(); - event.setMaterial(Scheelite).asDust(2500).asOre().harvestLevel(3); - event.setMaterial(Soapstone).asOre().harvestLevel(1); // TODO: Ore Gen; - event.setMaterial(Spodumene).asOre().harvestLevel(2); - event.setMaterial(Sperrylite).asOre().harvestLevel(2); - event.setMaterial(Spessartine).asOre().harvestLevel(2); - event.setMaterial(Sphalerite).asOre().harvestLevel(1); - event.setMaterial(Stibnite).asOre().harvestLevel(2); - event.setMaterial(Tantalite).asOre().harvestLevel(3); - event.setMaterial(Talc).asOre(); - event.setMaterial(Tetrahedrite).asOre().harvestLevel(2); - event.setMaterial(Tungstate).asOre().harvestLevel(3); - event.setMaterial(Uraninite).asOre().harvestLevel(2); - event.setMaterial(Uvarovite).asOre(); - event.setMaterial(VanadiumMagnetite).asOre().harvestLevel(2); - event.setMaterial(Wulfenite).asOre().harvestLevel(3); - event.setMaterial(YellowLimonite).asOre().harvestLevel(2); - event.setMaterial(Zircon).asOre(); - /** - ** Ore Stones - **/ - event.setMaterial(Bauxite).asOreStone(ORE_SMALL, ROCK).harvestLevel(1); - event.setMaterial(Lignite).asGemBasic(false).asOreStone(0, 2, ORE_SMALL, ROCK); - event.setMaterial(OilShale).asDust(ORE, ORE_STONE, ORE_SMALL, RAW_ORE, RAW_ORE_BLOCK, BEARING_ROCK, ROCK).setExpRange(1,5).harvestLevel(1); - event.setMaterial(RockSalt).asOreStone(ORE_SMALL, ROCK).harvestLevel(1); - event.setMaterial(Salt).asOreStone(ORE_SMALL, ROCK).harvestLevel(1); - /** - ** Gems - **/ - /** - * Regular - **/ - event.setMaterial(Amber).asGem(false).asOre(3, 7, true); - event.setMaterial(Amethyst).asGem(false).replaceItem(GEM_FLAWED, Items.AMETHYST_SHARD).asOre(3, 7, true); - event.setMaterial(Sapphire).asGem(true, BOULE).asOre(3, 7, true); - event.setMaterial(BlueTopaz).asGem(true).asOre(3, 7, true); - event.setMaterial(Glass).asFluid(0, 1500).asDust(PLATE, LENS, MOLTEN); - event.setMaterial(GreenSapphire).asGem(true, BOULE).asOre(3, 7, true); - event.setMaterial(Jade).asGem(false).asOre(3, 7, true); - event.setMaterial(Lazurite).asGemBasic(false, PLATE).asOre(2, 5, true).harvestLevel(1); - event.setMaterial(LigniteCoke).asGemBasic(false); - event.setMaterial(PetroleumCoke).asGemBasic(false); - event.setMaterial(Olivine).asGem(false, PLATE).asOre(3, 7, true); - event.setMaterial(Opal).asGem(true).asOre(3, 7, true); - event.setMaterial(TricalciumPhosphate).asOre(3, 7, true).harvestLevel(2); - event.setMaterial(MilkyQuartz).asGemBasic(false, BEARING_ROCK, ROD_LONG, QUARTZ_LIKE_BLOCKS).asOre(2, 5, true).harvestLevel(1); - event.setMaterial(RedGarnet).asGem(true).asOre(3, 7, true); - event.setMaterial(Ruby).asGem(true, BOULE).asOre(3, 7, true); - event.setMaterial(Sodalite).asGemBasic(false).asOre(2, 5, true).harvestLevel(1); - event.setMaterial(Tanzanite).asGem(false).asOre(3, 7, true); - event.setMaterial(Topaz).asGem(false).asOre(3, 7, true); - event.setMaterial(YellowGarnet).asGem(true).asOre(3, 7, true); - /** - * Basic - **/ - event.setMaterial(CertusQuartz).asGemBasic(false,PLATE, QUARTZ_LIKE_BLOCKS).asOre(1, 5, true); - event.setMaterial(Fluix).asGemBasic(false, QUARTZ_LIKE_BLOCKS); - event.setMaterial(Charcoal).asGemBasic(false); - event.setMaterial(CoalCoke).asGemBasic(false); - event.setMaterial(Apatite).asGemBasic(false, PLATE).asOre(2, 5, true).harvestLevel(1); - event.setMaterial(Monazite).asOre(3, 7, true).harvestLevel(1); - /** - ** Plastic Related - **/ - event.setMaterial(EpoxyResin).asSolid(400, 0, PLATE, MOLTEN); - event.setMaterial(FiberReinforcedEpoxyResin).flags(PLATE); - event.setMaterial(Plastic).asSolid(295, 0, PLATE, FOIL, FRAME).asFluid(); - //event.setMaterial(Polystyrene).asSolid(295, 0); - event.setMaterial(Polytetrafluoroethylene).asSolid(1400, 0, PLATE, FRAME, ROD_LONG); - event.setMaterial(PolyvinylChloride).asSolid(295, 0, PLATE, FOIL); - event.setMaterial(Rubber).asSolid(295, 0, PLATE, RING, MOLTEN); - event.setMaterial(SiliconeRubber).asSolid(900, 0, PLATE, FOIL, MOLTEN); - event.setMaterial(StyreneButadieneRubber).asSolid(295, 0, PLATE, RING); - /** - ** Misc - **/ - event.setMaterial(GalliumArsenide).asSolid(295, 1200, PLATE); - event.setMaterial(Superconductor).asSolid(PLATE); - /** - *** Fluids - **/ - /** - * Dyes - */ - event.setMaterial(WaterMixedWhiteDye).asFluid(); - event.setMaterial(WaterMixedOrangeDye).asFluid(); - event.setMaterial(WaterMixedMagentaDye).asFluid(); - event.setMaterial(WaterMixedLightBlueDye).asFluid(); - event.setMaterial(WaterMixedYellowDye).asFluid(); - event.setMaterial(WaterMixedLimeDye).asFluid(); - event.setMaterial(WaterMixedPinkDye).asFluid(); - event.setMaterial(WaterMixedGrayDye).asFluid(); - event.setMaterial(WaterMixedLightGrayDye).asFluid(); - event.setMaterial(WaterMixedCyanDye).asFluid(); - event.setMaterial(WaterMixedPurpleDye).asFluid(); - event.setMaterial(WaterMixedBlueDye).asFluid(); - event.setMaterial(WaterMixedBrownDye).asFluid(); - event.setMaterial(WaterMixedGreenDye).asFluid(); - event.setMaterial(WaterMixedRedDye).asFluid(); - event.setMaterial(WaterMixedBlackDye).asFluid(); - event.setMaterial(ChemicalWhiteDye).asFluid(); - event.setMaterial(ChemicalOrangeDye).asFluid(); - event.setMaterial(ChemicalMagentaDye).asFluid(); - event.setMaterial(ChemicalLightBlueDye).asFluid(); - event.setMaterial(ChemicalYellowDye).asFluid(); - event.setMaterial(ChemicalLimeDye).asFluid(); - event.setMaterial(ChemicalPinkDye).asFluid(); - event.setMaterial(ChemicalGrayDye).asFluid(); - event.setMaterial(ChemicalLightGrayDye).asFluid(); - event.setMaterial(ChemicalCyanDye).asFluid(); - event.setMaterial(ChemicalPurpleDye).asFluid(); - event.setMaterial(ChemicalBlueDye).asFluid(); - event.setMaterial(ChemicalBrownDye).asFluid(); - event.setMaterial(ChemicalGreenDye).asFluid(); - event.setMaterial(ChemicalRedDye).asFluid(); - event.setMaterial(ChemicalBlackDye).asFluid(); - - /** - * Organic - **/ - event.setMaterial(Acetone).asFluid(); - event.setMaterial(CharcoalByproducts).asGas(); - event.setMaterial(FermentedBiomass).asFluid(16); - event.setMaterial(SeedOil).asFluid(2).flags(SEMIFUELS); - event.setMaterial(WoodTar).asFluid(); - event.setMaterial(WoodVinegar).asFluid(); - //Alkanoles - event.setMaterial(Methanol).asFluid(84); - event.setMaterial(Ethanol).asFluid(148); - event.setMaterial(Propanol).asFluid(196); - event.setMaterial(Butanol).asFluid(166); - event.setMaterial(Heptanol).asFluid(226); - //Alkenoles - event.setMaterial(Ethenol).asFluid(120); - event.setMaterial(Propenol).asFluid(196); - event.setMaterial(Butenol).asFluid(186); - //Alkanedioles - event.setMaterial(Ethanediol).asFluid(216); - event.setMaterial(Propanediol).asFluid(256); - event.setMaterial(Butanediol).asFluid(286); - //Plastic Related - event.setMaterial(SiliconeRubber).asFluid(); - //Misc - event.setMaterial(AceticAcid).asFluid(); - event.setMaterial(AllylChloride).asFluid(); - event.setMaterial(Benzaldehyde).asFluid(); - event.setMaterial(Benzene).asFluid(288); - event.setMaterial(BenzoylChloride).asFluid(); - event.setMaterial(Biomass).asFluid(8).flags(SEMIFUELS); - event.setMaterial(BisphenolA).asFluid(); - event.setMaterial(Chloramine).asFluid(); - event.setMaterial(Chloroform).asFluid(); - event.setMaterial(Cumene).asFluid(); - event.setMaterial(Chlorobenzene).asFluid(); - event.setMaterial(Dichloroethane).asFluid(); - event.setMaterial(Dimethyldichlorosilane).asFluid(); - event.setMaterial(Dimethylhydrazine).asFluid(); - event.setMaterial(Epichlorohydrin).asFluid(); - event.setMaterial(Glue).asFluid(); - event.setMaterial(Glycerol).asFluid(164); - event.setMaterial(GlycerylTrinitrate).asFluid(); - event.setMaterial(Honey).asFluid(); // TODO: Only when Forestry's present; - event.setMaterial(Isoprene).asFluid(); - event.setMaterial(MethylAcetate).asFluid(); - event.setMaterial(Naphtha).asFluid(256); - event.setMaterial(Phenol).asFluid(288); - event.setMaterial(PolyvinylAcetate).asFluid(); - event.setMaterial(SquidInk).asFluid(); - event.setMaterial(Styrene).asFluid(); - event.setMaterial(SulfuricNaphtha).asFluid(32); - event.setMaterial(Toluene).asFluid(328); - event.setMaterial(VinylAcetate).asFluid(); - /** - * Inorganic - **/ - event.setMaterial(AluminiumFluoride).asFluid(0,1560).flags(MOLTEN, ACID); - event.setMaterial(Antimatter).asFluid(); - event.setMaterial(BlueVitriol).asFluid(); - event.setMaterial(GreenVitriol).asFluid(); - event.setMaterial(RedVitriol).asFluid(); - event.setMaterial(PinkVitriol).asFluid(); - event.setMaterial(CyanVitriol).asFluid(); - event.setMaterial(WhiteVitriol).asFluid(); - event.setMaterial(GrayVitriol).asFluid(); - event.setMaterial(MartianVitriol).asFluid(); - event.setMaterial(VitriolOfClay).asFluid(); - event.setMaterial(AquaRegia).asFluid().flags(ACID); - event.setMaterial(CalciumAcetateSolution).asFluid(); - event.setMaterial(ChloroplatinicAcid).asFluid().flags(ACID); - event.setMaterial(Coolant).asFluid(); - event.setMaterial(Cryolite).asFluid(0, 1285).flags(MOLTEN, ACID); - event.setMaterial(DistilledWater).asFluid(); - event.setMaterial(DilutedHydrochloricAcid).asFluid().flags(ACID); - event.setMaterial(DilutedSulfuricAcid).asFluid().flags(ACID); - event.setMaterial(DrillingFluid).asFluid(); // TODO: Perhaps for a bedrock drill; - event.setMaterial(HexafluorosilicicAcid).asFluid().flags(ACID); - event.setMaterial(HotCoolant).asFluid(0,500); - event.setMaterial(HeavyWater).asFluid(); - event.setMaterial(SemiheavyWater).asFluid(); - event.setMaterial(TritiatedWater).asFluid(); - event.setMaterial(HotHeavyWater).asFluid(0, 600); - event.setMaterial(HotSemiheavyWater).asFluid(0, 550); - event.setMaterial(HotTritiatedWater).asFluid(0, 650); - event.setMaterial(HotMoltenSodium).asFluid(0, 1100).flags(MOLTEN); - event.setMaterial(HotMoltenTin).asFluid(0, 2800).flags(MOLTEN); - event.setMaterial(HotMoltenLithiumChloride).asFluid(0, 1600).flags(MOLTEN); - event.setMaterial(HydrochloricAcid).asFluid().flags(ACID); - event.setMaterial(HydrofluoricAcid).asFluid().flags(ACID); - event.setMaterial(HydrogenFluoride).asGas().flags(ACID).fluidDensity(-111); - event.setMaterial(HydrogenPeroxide).asFluid(); - event.setMaterial(HypochlorousAcid).asFluid().flags(ACID); - - event.setMaterial(Lubricant).asFluid(); - event.setMaterial(NickelSulfate).asFluid(); - event.setMaterial(NitricAcid).asFluid().flags(ACID); - event.setMaterial(PeroxydisulfuricAcid).asFluid().flags(ACID); - event.setMaterial(PhosphoricAcid).asFluid().flags(ACID); - event.setMaterial(SaltWater).asFluid(); - event.setMaterial(SodiumPersulfateSolution).asFluid(); - event.setMaterial(Steam).asGas(1, 395).fluidDensity(-800); - event.setMaterial(SuperheatedSteam).asGas(2, 600).fluidDensity(-3000); - event.setMaterial(SulfuricAcid).asFluid().flags(ACID); - event.setMaterial(Tar).asFluid(); - event.setMaterial(ThoriumSalt).asFluid(0, 600).flags(MOLTEN); - event.setMaterial(TitaniumTetrachloride).asFluid().flags(ACID); - event.setMaterial(UUAmplifier).asFluid(); - event.setMaterial(UUMatter).asFluid(); - //Nuclear - /** - *** Gases/Plasmas - **/ - /** - * Organic - **/ - //Alkanes - event.setMaterial(Methane).asGas(104); - event.setMaterial(Ethane).asGas(168); - event.setMaterial(Propane).asGas(232).fluidDensity(-1000); - event.setMaterial(Butane).asGas(296).fluidDensity(-1000); - //Alkenes - event.setMaterial(Ethylene).asGas(128).fluidDensity(1000); - event.setMaterial(Propene).asGas(192); - event.setMaterial(Butene).asGas(256); - event.setMaterial(Butadiene).asGas(206); - //Misc - event.setMaterial(HotCarbonDioxide).asGas().fluidDensity(1000); - event.setMaterial(CarbonDioxide).asGas().fluidDensity(756); - event.setMaterial(CarbonMonoxide).asGas(24).fluidDensity(1134); - event.setMaterial(Chloromethane).asGas(); - event.setMaterial(Dimethylamine).asGas(); - event.setMaterial(LPG).asFluid(256); - event.setMaterial(NaturalGas).asGas(15).fluidDensity(-500); - event.setMaterial(RefineryGas).asGas(128); - event.setMaterial(SulfuricGas).asGas(20); - event.setMaterial(Tetrafluoroethylene).asGas(); - event.setMaterial(VinylChloride).asGas(); - event.setMaterial(WoodGas).asGas(24); - /** - * Inorganic - **/ - event.setMaterial(Air).asGas().fluidDensity(0); - event.setMaterial(Ammonia).asGas().flags(ACID).fluidDensity(-263); - event.setMaterial(DinitrogenTetroxide).asGas(); - event.setMaterial(HydrogenSulfide).asGas(); - event.setMaterial(NitrogenMonoxide).asGas(); - event.setMaterial(NitrogenDioxide).asGas(); - event.setMaterial(NobleGases).asGas(0,790); - event.setMaterial(SulfurDioxide).asGas().fluidDensity(689); - event.setMaterial(SulfurTrioxide).asGas(0,300).fluidDensity(517); - /** - ** Fuels - **/ - event.setMaterial(Creosote).asFluid(8).flags(SEMIFUELS); - event.setMaterial(Oil).asFluid(16).flags(SEMIFUELS); - event.setMaterial(OilHeavy).asFluid(32).flags(SEMIFUELS); - event.setMaterial(OilLight).asFluid(16).flags(SEMIFUELS); - event.setMaterial(BioDiesel).asFluid(192); - event.setMaterial(Diesel).asFluid(128); - event.setMaterial(FishOil).asFluid(2).flags(SEMIFUELS); - event.setMaterial(NitroDiesel).asFluid(512); - event.setMaterial(FuelOil).asFluid(448); - event.setMaterial(Gasoline).asFluid(384); - event.setMaterial(Kerosene).asFluid(384); - /** - ** Cracked Stuff - */ - event.setMaterial(SteamCrackedEthane).asGas(); - event.setMaterial(SteamCrackedPropane).asGas(); - event.setMaterial(SteamCrackedButane).asGas(); - event.setMaterial(SteamCrackedNaphtha).asFluid(); - event.setMaterial(SteamCrackedRefineryGas).asGas(); - event.setMaterial(HydroCrackedEthane).asGas(); - event.setMaterial(HydroCrackedPropane).asGas(); - event.setMaterial(HydroCrackedButane).asGas(); - event.setMaterial(HydroCrackedNaphtha).asFluid(); - event.setMaterial(HydroCrackedRefineryGas).asGas(); - processInto(event); - nuclearIsotopes(event); - toolsAndArmor(event); - workbenches(event); - } - - private static void processInto(GregTechMaterialEvent event){ - /** - *** Solids - **/ - /** - ** Metals - **/ - event.setMaterial(AnnealedCopper).mats(of(Copper, 1)); - event.setMaterial(BatteryAlloy).mats(of(Lead, 4, Antimony, 1)); - event.setMaterial(BismuthBronze).mats(of(Bismuth, 1, Zinc, 1, Copper, 3)); - event.setMaterial(BlackBronze).mats(of(Gold, 1, Silver, 1, Copper, 3)); - event.setMaterial(BlackSteel).mats(of(Nickel, 1, BlackBronze, 1, Steel, 3)); - event.setMaterial(BlueSteel).mats(of(RoseGold, 1, Brass, 1, Steel, 2, BlackSteel, 4)); - event.setMaterial(Brass).mats(of(Zinc, 1, Copper, 3)); - event.setMaterial(Bronze).mats(of(Tin, 1, Copper, 3)); - event.setMaterial(CdInAGAlloy).mats(of(Cadmium, 1, Indium, 1, Silver, 1)); - event.setMaterial(CobaltBrass).mats(of(Brass, 7, Aluminium, 1, Cobalt, 1)); - event.setMaterial(Cupronickel).mats(of(Copper, 1, Nickel, 1)); - event.setMaterial(Electrum).mats(of(Silver, 1, Gold, 1)); - event.setMaterial(HSSE).mats(of(HSSG, 6, Cobalt, 1, Manganese, 1, Silicon, 1)); - event.setMaterial(HSSG).mats(of(TungstenSteel, 5, Chromium, 1, Molybdenum, 2, Vanadium, 1)); - event.setMaterial(HSSS).mats(of(HSSG, 6, Iridium, 2, Osmium, 1)); - event.setMaterial(Invar).mats(of(Iron, 2, Nickel, 1)); - event.setMaterial(IronMagnetic).mats(of(Iron, 1)).elecTicks(52); - event.setMaterial(Kanthal).mats(of(Iron, 1, Aluminium, 1, Chromium, 1)); - event.setMaterial(Magnalium).mats(of(Magnesium, 1, Aluminium, 2)); - event.setMaterial(NeodymiumMagnetic).mats(of(Neodymium, 1)).elecTicks(122); - event.setMaterial(Nichrome).mats(of(Nickel, 4, Chromium, 1)); - event.setMaterial(NickelZincFerrite).mats(of(Nickel, 1, Zinc, 1, Iron, 4, Oxygen, 8)); - event.setMaterial(NiobiumTitanium).mats(of(Nickel, 4, Chromium, 1)); - event.setMaterial(Osmiridium).mats(of(Iridium, 3, Osmium, 1)).elecTicks(608); - event.setMaterial(RedAlloy).mats(of(Copper, 1, Redstone, 4)); - event.setMaterial(RedSteel).mats(of(SterlingSilver, 1, BismuthBronze, 1, Steel, 2, BlackSteel, 4)); - event.setMaterial(RoseGold).mats(of(Copper, 1, Gold, 4)); - event.setMaterial(SolderingAlloy).mats(of(Tin, 9, Antimony, 1)); - event.setMaterial(Steel).mats(of(Iron, 50, Carbon, 1), 50).elecTicks(2600); - event.setMaterial(SteelMagnetic).mats(of(Steel, 1)).elecTicks(52); - event.setMaterial(SterlingSilver).mats(of(Copper, 1, Silver, 4)); - event.setMaterial(StainlessSteel).mats(of(Iron, 6, Chromium, 1, Manganese, 1, Nickel, 1)).elecTicks(450); - event.setMaterial(TinAlloy).mats(of(Tin, 1, Iron, 1)); - event.setMaterial(TungstenCarbide).mats(of(Tungsten, 1, Carbon, 1)); - event.setMaterial(TungstenSteel).mats(of(Steel, 1, Tungsten, 1)); - event.setMaterial(Ultimet).mats(of(Cobalt, 5, Chromium, 2, Nickel, 1, Molybdenum, 1)).elecTicks(504); - event.setMaterial(VanadiumGallium).mats(of(Vanadium, 3, Gallium, 1)); - event.setMaterial(VanadiumSteel).mats(of(Vanadium, 1, Chromium, 1, Steel, 7)); - event.setMaterial(WroughtIron).mats(of(Iron, 1)); - event.setMaterial(YttriumBariumCuprate).mats(of(Yttrium, 1, Barium, 2, Copper, 3, Oxygen, 7)); - /** - ** Dusts - **/ - /** - * Organic - **/ - event.setMaterial(AntimonyTrioxide).mats(of(Antimony, 2, Oxygen, 3)).elecTicks(250); - event.setMaterial(Clay).mats(of(Alumina, 5, SiliconDioxide, 12, Water, 1, Sodium, 1, Lithium, 1), 18).elecTicks(182); - event.setMaterial(CupricOxide).mats(of(Copper, 1, Oxygen, 1)).elecTicks(72); - event.setMaterial(DarkAsh).mats(of(Carbon, 1, Ash, 1), 1); - event.setMaterial(Dibenzene).mats(of(Carbon,12,Hydrogen,10)); - event.setMaterial(DibenzoylPeroxide).mats(of(Carbon,14,Hydrogen,10,Oxygen,4)); - event.setMaterial(Polydimethylsiloxane).mats(of(Carbon, 2, Hydrogen, 6, Oxygen, 1, Silicon, 1)).elecTicks(80); - event.setMaterial(RawRubber).mats(of(Carbon, 5, Hydrogen, 8)); - event.setMaterial(RawStyreneButadieneRubber).mats(of(Styrene, 1, Butadiene, 3)); - event.setMaterial(SodaAsh).mats(of(Sodium, 2, Carbon, 1, Oxygen, 3)).elecTicks(96); - event.setMaterial(Wood).mats(of(Carbon, 1, Oxygen, 1, Hydrogen, 1)); - /** - * Inorganic - **/ - event.setMaterial(AluminiumHydroxide).mats(of(Aluminium, 1, Oxygen, 3, Hydrogen, 3)); - event.setMaterial(AluminiumTrichloride).mats(of(Aluminium,1,Chlorine,3)); - event.setMaterial(Aluminosilicate).mats(of(Aluminium, 2, Silicon, 1, Oxygen, 5)); - event.setMaterial(AmmoniumChloride).mats(of(Nitrogen,1, Hydrogen,4,Chlorine,1)); - event.setMaterial(ArsenicTrioxide).mats(of(Arsenic, 2, Oxygen, 3)).elecTicks(180); - event.setMaterial(Biotite).mats(b -> b.put(Potassium, 2).put(Magnesium, 6).put(Alumina, 15).put(SiliconDioxide, 18).put(Fluorine, 4)).elecTicks(440); - event.setMaterial(BlackGranite).mats(of(Biotite, 1, PotassiumFeldspar, 1, Flint, 1)); - event.setMaterial(BorosilicateGlass).mats(of(Boron, 1, Silicon, 7, Oxygen,14)); - event.setMaterial(Brick).mats(of(Aluminium, 4, Silicon, 3, Oxygen, 12)); - event.setMaterial(CalciumChloride).mats(of(Calcium, 1, Chlorine, 2)).elecTicks(1024); - event.setMaterial(CalciumSulfate).mats(of(Calcium, 1, Sulfur, 1, Oxygen, 4)); - event.setMaterial(CobaltOxide).mats(of(Cobalt, 1, Oxygen, 1)).elecTicks(68); - event.setMaterial(Concrete).mats(of(Stone, 1)).asFluid(); - event.setMaterial(DialuminiumTrioxide).mats(of(Aluminium,2,Oxygen,3)); - event.setMaterial(Energium).mats(of(Redstone,5,Ruby,4)); - event.setMaterial(FerricChloride).mats(of(Iron, 1, Chlorine, 3)).elecTicks(876); - event.setMaterial(FerriteMixture).mats(of(Nickel, 1, Zinc, 1, Iron, 4)); - event.setMaterial(Ferrosilite).mats(of(Iron, 1, Silicon, 1, Oxygen, 3)).elecTicks(120); - event.setMaterial(Fireclay).mats(of(Brick, 1)); - event.setMaterial(Fluorite).mats(of(Calcium, 1, Fluorine, 2)); - event.setMaterial(IndiumGalliumPhosphide).mats(of(Indium, 1, Gallium, 1, Phosphor, 1)); - event.setMaterial(IridiumSodiumOxide).mats(of(Iridium,1,Sodium,1,Oxygen,2)); - event.setMaterial(Komatiite).mats(of(Olivine, 1, MagnesiumCarbonate, 2, Flint, 6, DarkAsh, 3)); - event.setMaterial(Lapotronium).mats(of(Lapis, 6, Sapphire, 5, Redstone, 4)); - event.setMaterial(Limestone).mats(of(Calcite, 1)); - event.setMaterial(LithiumChloride).mats(of(Lithium, 1, Chlorine, 1)).elecTicks(256); - event.setMaterial(MagnesiumChloride).mats(of(Magnesium, 1, Chlorine, 2)).elecTicks(1024); - event.setMaterial(Marble).mats(of(Magnesium, 1, Calcite, 7)); - event.setMaterial(Massicot).mats(of(Lead, 1, Oxygen, 1)).elecTicks(180); - event.setMaterial(Obsidian).mats(of(Magnesium, 1, Iron, 1, Silicon, 2, Oxygen, 8)).elecTicks(240); - event.setMaterial(PhosphorousPentoxide).mats(of(Phosphor, 4, Oxygen, 10)).elecTicks(560); - event.setMaterial(PotassiumBisulfate).mats(of(Potassium, 1, Hydrogen, 1, Sulfur, 1, Oxygen, 4)).elecTicks(300); - event.setMaterial(PotassiumFeldspar).mats(of(Potassium, 2, Alumina, 5, SiliconDioxide, 18, Oxygen, 1)).elecTicks(260); - event.setMaterial(Powellite).mats(of(Calcium, 1, Molybdenum, 1, Oxygen, 4)); - //event.setMaterial(Pyrochlore).asDust(ORE).addComposition(of(Calcium, 2, Niobium, 2, Oxygen, 7)); - event.setMaterial(Quartzite).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(60); - event.setMaterial(Quicklime).mats(of(Calcium, 1, Oxygen, 1)).elecTicks(56); - event.setMaterial(ReactionCatalyst).mats(of(Copper,1,Zinc,1,Aluminium,2,Oxygen,4)); - event.setMaterial(RedGranite).mats(of(Biotite, 1, PotassiumFeldspar, 1, Flint, 1)).elecTicks(120); - event.setMaterial(SiliconDioxide).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(240); - event.setMaterial(Shale).mats(of(Calcite, 2, MilkyQuartz, 1, Clay, 1)); - //event.setMaterial(Slate).mats(of()) - event.setMaterial(SodiumAluminate).mats(of(Sodium, 1, Aluminium, 1, Oxygen, 2)); - event.setMaterial(SodiumBisulfate).mats(of(Sodium, 1, Hydrogen, 1, Sulfur, 1, Oxygen, 4)).elecTicks(600); - event.setMaterial(SodiumPersulfate).mats(of(Sodium, 2, Sulfur, 2, Oxygen, 8)).elecTicks(432); - event.setMaterial(SodiumHydroxide).mats(of(Sodium, 1, Oxygen, 1, Hydrogen, 1)).elecTicks(36); - event.setMaterial(SodiumSulfate).mats(of(Sodium, 2, Sulfur, 1, Oxygen, 4)); - event.setMaterial(SodiumSulfide).mats(of(Sodium, 2, Sulfur, 1)).elecTicks(72); - event.setMaterial(TungsticAcid).mats(of(Hydrogen, 2, Tungsten, 1, Oxygen, 4)); - event.setMaterial(TungstenTrioxide).mats(of(Tungsten, 1, Oxygen, 3)); - event.setMaterial(Wollastonite).mats(of(Calcium, 1, SiliconDioxide, 3, Oxygen, 1)).elecTicks(1460); - //Nuclear - - /** - ** Ores - **/ - event.setMaterial(Almandine).mats(of(Alumina, 5, Iron, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(480); - event.setMaterial(Alumina).mats(of(Aluminium, 2, Oxygen, 3)).elecTicks(480); - event.setMaterial(Andradite).mats(of(Calcium, 3, Iron, 2, Silicon, 3, Oxygen, 12)).elecTicks(480); - event.setMaterial(Hematite).mats(of(Iron, 2, Oxygen, 3)).elecTicks(150); - event.setMaterial(Bastnasite).mats(of(Cerium, 1, Carbon, 1, Fluorine, 1, Oxygen, 3)).elecTicks(192); - event.setMaterial(Barite).mats(of(Barium, 1, Sulfur, 1, Oxygen, 4)).elecTicks(204); - event.setMaterial(Bentonite).mats(b -> b.put(Sodium, 1).put(Magnesium, 6).put(Silicon, 12).put(Hydrogen, 6).put(Water, 5).put(Oxygen, 36)).elecTicks(480); // TODO: Ore Gen - event.setMaterial(BrownLimonite).mats(of(Iron, 1, Hydrogen, 1, Oxygen, 2)); - event.setMaterial(Calcite).mats(of(Calcium, 1, Carbon, 1, Oxygen, 3)).elecTicks(100); - event.setMaterial(Cassiterite).mats(of(Tin, 1, Oxygen, 2), 1).elecTicks(132); - event.setMaterial(Chalcopyrite).mats(of(Copper, 1, Iron, 1, Sulfur, 2)).elecTicks(168); - event.setMaterial(Cinnabar).mats(of(Mercury, 1, Sulfur, 1)); - event.setMaterial(Chromite).mats(of(Iron, 1, Chromium, 2, Oxygen, 4)).elecTicks(210); - event.setMaterial(Cobaltite).mats(of(Cobalt, 1, Arsenic, 1, Sulfur, 1)).elecTicks(150); - event.setMaterial(Sheldonite).mats(of(Platinum, 3, Nickel, 1, Sulfur, 1, Palladium, 1)); - event.setMaterial(Galena).mats(of(Lead, 3, Silver, 3, Sulfur, 2)).elecTicks(832); - event.setMaterial(Garnierite).mats(of(Nickel, 1, Oxygen, 1), 1).elecTicks(72); - event.setMaterial(Graphite).mats(of(Carbon, 4), 1).elecTicks(100); - event.setMaterial(Glauconite).mats(of(Alumina, 10, Potassium, 1, Magnesium, 2, Water, 3, Oxygen, 7)).elecTicks(378); // TODO: Ore Gen; - event.setMaterial(Grossular).mats(of(Alumina, 5, Calcium, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(440); - event.setMaterial(Ilmenite).mats(of(Iron, 1, Titanium, 1, Oxygen, 3)); - event.setMaterial(Lepidolite).mats(of(Alumina, 10, Potassium, 1, Lithium, 3, Fluorine, 2, Oxygen, 6)).elecTicks(320); // TODO: Ore Gen; - event.setMaterial(Rutile).mats(of(Cobalt, 1, Arsenic, 1, Sulfur, 1)); - event.setMaterial(Magnesite).mats(of(Magnesium, 1, Carbon, 1, Oxygen, 3)).elecTicks(80); - event.setMaterial(Magnetite).mats(of(Iron, 3, Oxygen, 4)).elecTicks(210); - event.setMaterial(Malachite).mats(of(Copper, 2, Carbon, 1, Hydrogen, 2, Oxygen, 5)).elecTicks(200); - event.setMaterial(Molybdenite).mats(of(Molybdenum, 1, Sulfur, 2)).elecTicks(144); - event.setMaterial(Pentlandite).mats(of(Nickel, 9, Sulfur, 8)).elecTicks(748); - event.setMaterial(Phosphate).mats(of(Phosphor, 1, Oxygen, 4)).elecTicks(360); - event.setMaterial(Pitchblende).mats(of(Uraninite, 3, Thorium, 1, Lead, 1)); - event.setMaterial(Pyrite).mats(of(Iron, 1, Sulfur, 2)).elecTicks(114); - event.setMaterial(Pyrolusite).mats(of(Manganese, 1, Oxygen, 2)).elecTicks(78); - event.setMaterial(Pyrope).mats(of(Alumina, 5, Magnesium, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(400); - event.setMaterial(Saltpeter).mats(of(Potassium, 1, Nitrogen, 1, Oxygen, 3)).elecTicks(100); - event.setMaterial(Scheelite).mats(of(Tungsten, 1, Calcium, 2, Oxygen, 4)).elecTicks(120); - event.setMaterial(Soapstone).mats(of(Magnesium, 3, Silicon, 4, Hydrogen, 2, Oxygen, 12)).elecTicks(378); // TODO: Ore Gen; - event.setMaterial(Spodumene).mats(of(Lithium, 2, Alumina, 5, SiliconDioxide, 12, Oxygen, 1)).elecTicks(180); - event.setMaterial(Sperrylite).mats(of(Platinum, 1, Arsenic, 2)).elecTicks(1226); - event.setMaterial(Spessartine).mats(of(Alumina, 5, Manganese, 3, SiliconDioxide, 9, Oxygen, 3)).elecTicks(440); - event.setMaterial(Sphalerite).mats(of(Zinc, 1, Sulfur, 1)).elecTicks(92); - event.setMaterial(Stibnite).mats(of(Antimony, 2, Sulfur, 3)); - event.setMaterial(Tantalite).mats(of(Manganese, 1, Tantalum, 2, Oxygen, 6)).elecTicks(432); - event.setMaterial(Talc).mats(of(Magnesium, 3, Silicon, 4, Hydrogen, 2, Oxygen, 12)).elecTicks(378); - event.setMaterial(Tetrahedrite).mats(of(Copper, 3, Antimony, 1, Sulfur, 3, Iron, 1)); - event.setMaterial(Tungstate).mats(of(Tungsten, 1, Lithium, 2, Oxygen, 4)).elecTicks(120); - event.setMaterial(Uraninite).mats(of(Uranium, 1, Oxygen, 2)); - event.setMaterial(Uvarovite).mats(of(Calcium, 3, Chromium, 2, Silicon, 3, Oxygen, 12)).elecTicks(480); - event.setMaterial(VanadiumMagnetite).mats(of(Magnetite, 1, Vanadium, 1)); - event.setMaterial(Wulfenite).mats(of(Lead, 1, Molybdenum, 1, Oxygen, 4)); - event.setMaterial(YellowLimonite).mats(of(Iron, 1, Hydrogen, 1, Oxygen, 2)); - event.setMaterial(Zircon).mats(of(Zirconium, 1, SiliconDioxide, 3, Oxygen, 2)).elecTicks(1740); - /** - ** Ore Stones - **/ - event.setMaterial(Bauxite).mats(of(Rutile, 2, Aluminium, 16, Hydrogen, 10, Oxygen, 11)); - event.setMaterial(Lignite).mats(of(Carbon, 3, Water, 1)).elecTicks(40); - event.setMaterial(RockSalt).mats(of(Potassium, 1, Chlorine, 1)).elecTicks(72); - event.setMaterial(Salt).mats(of(Sodium, 1, Chlorine, 1)).elecTicks(320); - /** - ** Gems - **/ - /** - * Regular - **/ - event.setMaterial(Amethyst).mats(of(SiliconDioxide, 4, Iron, 1)).elecTicks(130); - event.setMaterial(Sapphire).mats(of(Alumina, 5, Iron, 1)).elecTicks(100); - event.setMaterial(BlueTopaz).mats(of(Alumina, 5, SiliconDioxide, 3, Fluorine, 2, Water, 3)).elecTicks(208); - event.setMaterial(Glass).mats(of(SiliconDioxide, 1)); - event.setMaterial(GreenSapphire).mats(of(Alumina, 5, Magnesium, 1)).elecTicks(100); - event.setMaterial(Lazurite).mats(of(Alumina, 3, SiliconDioxide, 3, Calcium, 4, Sodium, 4)).elecTicks(392); - event.setMaterial(Olivine).mats(of(Magnesium, 2, Iron, 1, SiliconDioxide, 2)).elecTicks(140); - event.setMaterial(Opal).mats(of(SiliconDioxide, 1)).elecTicks(20); - event.setMaterial(TricalciumPhosphate).mats(of(Calcium, 3, Phosphate, 2)); - event.setMaterial(MilkyQuartz).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(60); - event.setMaterial(RedGarnet).mats(of(Pyrope, 3, Almandine, 5, Spessartine, 8)); - event.setMaterial(Ruby).mats(of(Chromium, 1, Alumina, 5)).elecTicks(144); - event.setMaterial(Sodalite).mats(of(Alumina, 3, SiliconDioxide, 3, Sodium, 4, Chlorine, 1)).elecTicks(264); - event.setMaterial(Tanzanite).mats(of(Alumina, 15, Calcium, 4, SiliconDioxide, 18, Water, 3, Oxygen, 4)).elecTicks(440); - event.setMaterial(Topaz).mats(of(Alumina, 5, SiliconDioxide, 3, Fluorine, 2, Water, 3)).elecTicks(208); - event.setMaterial(YellowGarnet).mats(of(Andradite, 5, Grossular, 8, Uvarovite, 3)); - /** - * Basic - **/ - event.setMaterial(Charcoal).mats(of(Carbon, 1)).elecTicks(12); - event.setMaterial(CoalCoke).mats(of(Carbon, 2)).elecTicks(12); - event.setMaterial(Apatite).mats(of(Calcium, 5, Phosphate, 3, Chlorine, 1)).elecTicks(288); - event.setMaterial(Monazite).mats(of(RareEarth, 1, Phosphate, 1)).elecTicks(104); - /** - ** Plastic Related - **/ - event.setMaterial(EpoxyResin).mats(of(Carbon, 2, Hydrogen, 4, Oxygen, 1)); - event.setMaterial(FiberReinforcedEpoxyResin).mats(of(EpoxyResin, 1)); - event.setMaterial(Plastic).mats(of(Carbon, 1, Hydrogen, 2)); - //event.setMaterial(Polystyrene).mats(of(Carbon, 8, Hydrogen, 8)); - event.setMaterial(Polytetrafluoroethylene).mats(of(Carbon, 2, Fluorine, 4)); - event.setMaterial(PolyvinylChloride).mats(of(Carbon, 2, Hydrogen, 3, Chlorine, 1)); - event.setMaterial(Rubber).mats(of(Carbon, 5, Hydrogen, 8)); - event.setMaterial(SiliconeRubber).mats(of(Carbon, 2, Hydrogen, 6, Oxygen, 1, Silicon, 1)); - event.setMaterial(StyreneButadieneRubber).mats(of(Styrene, 1, Butadiene, 3)); - /** - ** Misc - **/ - event.setMaterial(GalliumArsenide).mats(of(Arsenic, 1, Gallium, 1)); - /** - *** Fluids - **/ - /** - * Organic - **/ - event.setMaterial(Acetone).mats(of(Carbon, 3, Hydrogen, 6, Oxygen, 1)).elecTicks(240); - event.setMaterial(CharcoalByproducts).mats(of(WoodTar,1,WoodGas,1,WoodVinegar,2)); - event.setMaterial(WoodTar).mats(of(Creosote,4,Phenol,1,Benzene,2,Toluene,1)); - //Alkanoles - event.setMaterial(Methanol).mats(of(Carbon, 1, Hydrogen, 4, Oxygen, 1)).elecTicks(144); - event.setMaterial(Ethanol).mats(of(Carbon, 2, Hydrogen, 6, Oxygen, 1)).elecTicks(144); - event.setMaterial(Propanol).mats(of(Carbon, 3, Hydrogen, 8, Oxygen, 1)); - event.setMaterial(Butanol).mats(of(Carbon, 4, Hydrogen, 10, Oxygen, 1)); - event.setMaterial(Heptanol).mats(of(Carbon, 7, Hydrogen, 16, Oxygen, 1)); - //Alkenoles - event.setMaterial(Ethenol).mats(of(Carbon, 2, Hydrogen, 4, Oxygen, 1)); - event.setMaterial(Propenol).mats(of(Carbon, 3, Hydrogen, 6, Oxygen, 1)); - event.setMaterial(Butenol).mats(of(Carbon, 4, Hydrogen, 8, Oxygen, 1)); - //Alkanedioles - event.setMaterial(Ethanediol).mats(of(Carbon, 2, Hydrogen, 6, Oxygen, 2)); - event.setMaterial(Propanediol).mats(of(Carbon, 3, Hydrogen, 8, Oxygen, 2)); - event.setMaterial(Butanediol).mats(of(Carbon, 4, Hydrogen, 10, Oxygen, 2)); - //Misc - event.setMaterial(AceticAcid).mats(of(Carbon, 2, Hydrogen, 4, Oxygen, 2)).elecTicks(128); - event.setMaterial(AllylChloride).mats(of(Carbon, 3, Hydrogen, 5, Chlorine, 1)).elecTicks(288); - event.setMaterial(Benzaldehyde).mats(of(Carbon,7,Hydrogen,6,Oxygen,1)); - event.setMaterial(Benzene).mats(of(Carbon, 6, Hydrogen, 6)).elecTicks(48); - event.setMaterial(BenzoylChloride).mats(of(Carbon,7,Hydrogen,5,Chlorine,1,Oxygen,1)); - event.setMaterial(BisphenolA).mats(of(Carbon, 15, Hydrogen, 16, Oxygen, 2)); - event.setMaterial(Chloramine).mats(of(Nitrogen, 1, Hydrogen, 2, Chlorine, 1)).elecTicks(192); - event.setMaterial(Chloroform).mats(of(Carbon, 1, Hydrogen, 1, Chlorine, 3)).elecTicks(440); - event.setMaterial(Cumene).mats(of(Carbon, 9, Hydrogen, 12)); - event.setMaterial(Chlorobenzene).mats(of(Carbon, 6, Hydrogen, 5, Chlorine, 1)).elecTicks(384); - event.setMaterial(Dichloroethane).mats(of(Carbon,2,Hydrogen,4,Chlorine,2)); - event.setMaterial(Dimethyldichlorosilane).mats(of(Carbon, 2, Hydrogen, 6, Chlorine, 2, Silicon, 1)).elecTicks(528); - event.setMaterial(Dimethylhydrazine).mats(of(Carbon, 2, Hydrogen, 8, Nitrogen, 2)); - event.setMaterial(Epichlorohydrin).mats(of(Carbon, 3, Hydrogen, 5, Chlorine, 1, Oxygen, 1)).elecTicks(320); - event.setMaterial(Glycerol).mats(of(Carbon, 3, Hydrogen, 8, Oxygen, 3)).elecTicks(336); - event.setMaterial(GlycerylTrinitrate).mats(of(Carbon, 3, Hydrogen, 5, Nitrogen, 3, Oxygen, 9)).elecTicks(800); - event.setMaterial(Isoprene).mats(of(Carbon, 8, Hydrogen, 8)).elecTicks(208); - event.setMaterial(MethylAcetate).mats(of(Carbon, 3, Hydrogen, 6, Oxygen, 2)).elecTicks(264); - event.setMaterial(Naphtha).mats(of(Carbon,8,Hydrogen,16)); - event.setMaterial(Phenol).mats(of(Carbon, 6, Hydrogen, 6, Oxygen, 1)).elecTicks(312); - event.setMaterial(PolyvinylAcetate).mats(of(Carbon, 4, Hydrogen, 6, Oxygen, 2)); - event.setMaterial(Styrene).mats(of(Carbon, 8, Hydrogen, 8)).elecTicks(48); - event.setMaterial(SulfuricNaphtha).mats(of(Naphtha, 1, HydrogenSulfide,1)); - event.setMaterial(Toluene).mats(of(Carbon, 7, Hydrogen, 8)).elecTicks(360); - event.setMaterial(VinylAcetate).mats(of(Carbon, 4, Hydrogen, 6, Oxygen, 2)).elecTicks(144); - /** - * Inorganic - **/ - event.setMaterial(BlueVitriol).mats(of(Copper,1,Sulfur,1,Oxygen,4)); - event.setMaterial(GreenVitriol).mats(of(Iron,1,Sulfur,1,Oxygen,4)); - event.setMaterial(RedVitriol).mats(of(Cobalt,1,Sulfur,1,Oxygen,4)); - event.setMaterial(PinkVitriol).mats(of(Magnesium,1,Sulfur,1,Oxygen,4)); - event.setMaterial(CyanVitriol).mats(of(Nickel,1,Sulfur,1,Oxygen,4)); - event.setMaterial(WhiteVitriol).mats(of(Zinc,1,Sulfur,1,Oxygen,4)); - event.setMaterial(GrayVitriol).mats(of(Manganese,1,Sulfur,1,Oxygen,4)); - event.setMaterial(VitriolOfClay).mats(of(Alumina, 1, Sulfur, 3, Oxygen, 8)); - event.setMaterial(CalciumAcetateSolution).mats(of(Calcium, 1, Carbon, 2, Oxygen, 4, Hydrogen, 6)).elecTicks(520); - event.setMaterial(DistilledWater).mats(of(Hydrogen,2, Oxygen, 1)).elecTicks(2000); - event.setMaterial(DilutedHydrochloricAcid).mats(of(Hydrogen, 1, Chlorine, 1)); - event.setMaterial(DilutedSulfuricAcid).mats(of(Hydrogen,2,Sulfur,1,Oxygen,4)); - event.setMaterial(HeavyWater).mats(of(Deuterium, 2, Oxygen, 1)).elecTicks(2000); - event.setMaterial(SemiheavyWater).mats(of(Hydrogen, 1, Deuterium, 1, Oxygen, 1)).elecTicks(2000); - event.setMaterial(TritiatedWater).mats(of(Tritanium, 2, Oxygen, 1)).elecTicks(2000); - event.setMaterial(HotHeavyWater).mats(of(Deuterium, 2, Oxygen, 1)); - event.setMaterial(HotSemiheavyWater).mats(of(Hydrogen, 1, Deuterium, 1, Oxygen, 1)); - event.setMaterial(HotTritiatedWater).mats(of(Tritanium, 2, Oxygen, 1)); - event.setMaterial(HotMoltenLithiumChloride).mats(of(LithiumChloride, 1)); - event.setMaterial(HydrochloricAcid).mats(of(Hydrogen, 1, Chlorine, 1)).elecTicks(720); - event.setMaterial(HydrofluoricAcid).mats(of(Hydrogen, 1, Fluorine, 1)).elecTicks(80); - event.setMaterial(HydrogenFluoride).mats(of(Hydrogen, 1, Fluorine, 1)).elecTicks(80); - event.setMaterial(HydrogenPeroxide).mats(of(Hydrogen,2,Oxygen,2)); - event.setMaterial(HypochlorousAcid).mats(of(Hydrogen, 1, Chlorine, 1, Oxygen, 1)).elecTicks(192); - - event.setMaterial(NickelSulfate).mats(of(Nickel,1,Sulfur,1,Oxygen,4)).elecTicks(900); - event.setMaterial(NitricAcid).mats(of(Hydrogen, 1, Nitrogen, 1, Oxygen, 3)).elecTicks(240); - event.setMaterial(PeroxydisulfuricAcid).mats(of(Sulfur,2,Hydrogen,2,Oxygen,8)); - event.setMaterial(PhosphoricAcid).mats(of(Hydrogen, 3, Phosphor, 1, Oxygen, 4)).elecTicks(392); - event.setMaterial(SaltWater).mats(of(Hydrogen,1,SodiumHydroxide,3,Chlorine,1), 8).elecTicks(720); - event.setMaterial(Steam).mats(of(Water,1)); - event.setMaterial(SuperheatedSteam).mats(of(Steam, 1)); - event.setMaterial(SulfuricAcid).mats(of(Hydrogen, 2, Sulfur, 1, Oxygen, 4)).elecTicks(392); - event.setMaterial(SulfurTrioxide).mats(of(Sulfur, 1, Oxygen, 3)).elecTicks(320); - event.setMaterial(SulfurDioxide).mats(of(Sulfur, 1, Oxygen, 2)).elecTicks(300); - event.setMaterial(TitaniumTetrachloride).mats(of(Titanium, 1, Chlorine, 4)); - /** - *** Gases/Plasmas - **/ - /** - * Organic - **/ - //Alkanes - event.setMaterial(Methane).mats(of(Carbon, 1, Hydrogen, 4)).elecTicks(80); - event.setMaterial(Ethane).mats(of(Carbon, 2, Hydrogen, 6)).elecTicks(64); - event.setMaterial(Propane).mats(of(Carbon, 2, Hydrogen, 6)).elecTicks(196); - event.setMaterial(Butane).mats(of(Carbon, 4, Hydrogen, 10)).elecTicks(112); - //Alkenes - event.setMaterial(Ethylene).mats(of(Carbon, 2, Hydrogen, 4)).elecTicks(48); - event.setMaterial(Propene).mats(of(Carbon, 3, Hydrogen, 6)).elecTicks(48); - event.setMaterial(Butene).mats(of(Carbon, 4, Hydrogen, 8)).elecTicks(48); - event.setMaterial(Butadiene).mats(of(Carbon, 4, Hydrogen, 6)).elecTicks(120); - //Misc - event.setMaterial(CarbonDioxide).mats(of(Carbon, 1, Oxygen, 2)).elecTicks(300); - event.setMaterial(CarbonMonoxide).mats(of(Carbon, 1, Oxygen, 1)).elecTicks(112); - event.setMaterial(Chloromethane).mats(of(Carbon, 1, Hydrogen, 3, Chlorine, 1)).elecTicks(200); - event.setMaterial(Dimethylamine).mats(of(Carbon, 2, Hydrogen, 7, Nitrogen, 1)).elecTicks(160); - event.setMaterial(NaturalGas).mats(of(Methane,4,Ethane,2,Propane,2,Butane,1)); - event.setMaterial(RefineryGas).asGas(128); - event.setMaterial(SulfuricGas).mats(of(NaturalGas,1,Sulfur,1)); - event.setMaterial(Tetrafluoroethylene).mats(of(Carbon, 2, Fluorine, 4)); - event.setMaterial(VinylChloride).mats(of(Carbon, 2, Hydrogen, 3, Chlorine, 1)).elecTicks(240); - event.setMaterial(WoodGas).mats(of(CarbonDioxide,8,CarbonMonoxide,4,Methane,2,Ethylene,1,Hydrogen,1)); - /** - * Inorganic - **/ - //event.setMaterial(Air).mats(of(Nitrogen, 40, Oxygen, 11, Argon, 1, NobleGases, 1 )); - event.setMaterial(Ammonia).mats(of(Nitrogen, 1, Hydrogen, 3)).elecTicks(64); - event.setMaterial(DinitrogenTetroxide).mats(of(Nitrogen, 2, Oxygen, 4)).elecTicks(168); - event.setMaterial(HydrogenSulfide).mats(of(Hydrogen, 2, Sulfur, 1)); - event.setMaterial(NitrogenMonoxide).mats(of(Nitrogen, 1, Oxygen, 1)).elecTicks(112); - event.setMaterial(NitrogenDioxide).mats(of(Nitrogen, 1, Oxygen, 2)).elecTicks(168); - event.setMaterial(SulfurDioxide).mats(of(Sulfur, 1, Oxygen, 2)); - event.setMaterial(SulfurTrioxide).mats(of(Sulfur, 1, Oxygen, 3)); - /** - ** Cracked Stuff - */ - event.setMaterial(SteamCrackedEthane).mats(of(Ethane,1,Steam,1)); - event.setMaterial(SteamCrackedPropane).mats(of(Propane,1,Steam,1)); - event.setMaterial(SteamCrackedButane).mats(of(Butane,1,Steam,1)); - event.setMaterial(SteamCrackedNaphtha).mats(of(Naphtha,1,Steam,1)); - event.setMaterial(SteamCrackedRefineryGas).mats(of(RefineryGas,1,Steam,1)); - event.setMaterial(HydroCrackedEthane).mats(of(Ethane,1,Hydrogen,1)); - event.setMaterial(HydroCrackedPropane).mats(of(Propane,1,Hydrogen,1)); - event.setMaterial(HydroCrackedButane).mats(of(Butane,1,Hydrogen,2)); - event.setMaterial(HydroCrackedNaphtha).mats(of(Naphtha,1,Hydrogen,2)); - event.setMaterial(HydroCrackedRefineryGas).mats(of(RefineryGas,1,Hydrogen,2)); - } - - private static void toolsAndArmor(GregTechMaterialEvent event){ - /** - ** Periodic Elements - */ - event.setMaterial(Beryllium).tool().toolDamage(2).toolSpeed(14).toolDurability(64).toolQuality(2).build(); - event.setMaterial(Titanium).tool().toolDamage(3).toolSpeed(8).toolDurability(2560).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build(); - event.setMaterial(Chromium).tool().toolDamage(3).toolSpeed(11).toolDurability(256).toolQuality(3).build(); - event.setMaterial(Manganese).tool().toolDamage(2).toolSpeed(7).toolDurability(256).toolQuality(2).build(); - event.setMaterial(Cobalt).tool().toolDamage(3).toolSpeed(5).toolDurability(256).toolQuality(3).build(); - event.setMaterial(Nickel).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 2)).build().harvestLevel(2); - event.setMaterial(Zirconium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); - event.setMaterial(Molybdenum).tool().toolDamage(2).toolSpeed(7).toolDurability(512).toolQuality(2).build().harvestLevel(2); - event.setMaterial(Technetium).tool().toolDamage(1).toolSpeed(10).toolDurability(1280).toolQuality(1).build(); - event.setMaterial(Palladium).tool().toolDamage(2).toolSpeed(8).toolDurability(512).toolQuality(2).build().harvestLevel(2); - event.setMaterial(Neodymium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); - event.setMaterial(Tungsten).tool().toolDamage(3).toolSpeed(8).toolDurability(5120).toolQuality(3).build(); // TODO: stats like non burnable - event.setMaterial(Osmium).tool().toolDamage(4).toolSpeed(16).toolDurability(1280).toolQuality(4).build(); - event.setMaterial(Iridium).tool().toolDamage(4).toolSpeed(6).toolDurability(5120).toolQuality(4).build(); - event.setMaterial(Platinum).tool().toolDamage(2).toolSpeed(15).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 5)).build().harvestLevel(2); - event.setMaterial(Thorium).tool().toolDamage(2).toolSpeed(6).toolDurability(512).toolQuality(2).build().harvestLevel(2); - event.setMaterial(Uranium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); - event.setMaterial(Plutonium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); // TODO: Enchantment: Radioactivity; - - /** - ** Metals - **/ - event.setMaterial(BismuthBronze).tool().toolDamage(2).toolSpeed(8).toolDurability(512).toolQuality(2).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 4)).build() - .addArmor(new int[]{2, 6, 5, 2}, 0.0f, 0.0f, 16); - event.setMaterial(BlackBronze).tool().toolDamage(2).toolSpeed(12).toolDurability(512).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 2)).build() - .addArmor(new int[]{2, 6, 5, 2}, 0.0f, 0.0f, 16); - event.setMaterial(BlackSteel).tool().toolDamage(2).toolSpeed(6.5f).toolDurability(768).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build() - .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 32, of(Enchantments.ALL_DAMAGE_PROTECTION, 2)); - event.setMaterial(BlueSteel).tool().toolDamage(2).toolSpeed(7).toolDurability(896).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build() - .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 37, of(Enchantments.ALL_DAMAGE_PROTECTION, 3)); - event.setMaterial(Bronze).tool().toolDamage(2).toolSpeed(6).toolDurability(448).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 1)).build() - .addArmor(new int[]{2, 6, 5, 2}, 0.0F, 0.0F, 12); - event.setMaterial(CobaltBrass).tool().toolDamage(2).toolSpeed(8).toolDurability(256).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 2)).build(); - //event.setMaterial(Duranium).addHandleStat(620, -1.0F, of(Enchantments.SILK_TOUCH, 1)) - //.addTools(6.5F, 16.0F, 5120, 5); - event.setMaterial(Electrum).tool().toolDamage(2).toolSpeed(12).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 3)).build(); - event.setMaterial(EnrichedNaquadah).tool().toolDamage(4).toolSpeed(6).toolDurability(1280).toolQuality(4).build(); - event.setMaterial(HSSE).tool().toolDamage(4).toolSpeed(10).toolDurability(5120).toolQuality(4).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); - event.setMaterial(HSSG).tool().toolDamage(3).toolSpeed(10).toolDurability(4000).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); - event.setMaterial(HSSS).tool().toolDamage(4).toolSpeed(14).toolDurability(3000).toolQuality(4).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); - event.setMaterial(Invar).tool().toolDamage(2).toolSpeed(6).toolDurability(256).toolQuality(3).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 3)).build() - .addArmor(new int[]{2, 6, 5, 2}, 0.0F, 0.0F, 15, of(Enchantments.FIRE_PROTECTION, 1)); - event.setMaterial(IronMagnetic).tool(Iron).toolEnchantments(of(Enchantments.SHARPNESS, 1)).build(); - event.setMaterial(Kanthal).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).build(); - event.setMaterial(Neutronium).tool().toolDamage(9).toolSpeed(24).toolDurability(655360).toolQuality(6).build(); - event.setMaterial(Naquadah).tool().toolDamage(4).toolSpeed(6).toolDurability(1280).toolQuality(4).build(); - event.setMaterial(NaquadahAlloy).tool().toolDamage(4.5f).toolSpeed(8).toolDurability(5120).toolQuality(4).build(); - event.setMaterial(Nichrome).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 2)).build(); - event.setMaterial(NickelZincFerrite).tool().toolDamage(0).toolSpeed(3).toolDurability(32).toolQuality(1).build(); - event.setMaterial(Osmiridium).tool().toolDamage(4).toolSpeed(11).toolDurability(3840).toolQuality(4).build(); - event.setMaterial(RedSteel).tool().toolDamage(2).toolSpeed(7.5f).toolDurability(1024).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build() - .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 42, of(Enchantments.ALL_DAMAGE_PROTECTION, 3)); - event.setMaterial(RoseGold).tool().toolDamage(2).toolSpeed(14).toolDurability(128).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 4)).build(); - event.setMaterial(Steel).tool(Iron).toolDurability(512).toolEnchantments(of(Enchantments.SHARPNESS, 2)).build() - .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 21, of(Enchantments.ALL_DAMAGE_PROTECTION, 1)); - event.setMaterial(SteelMagnetic).tool(Steel).toolEnchantments(of(Enchantments.SHARPNESS, 2)).build(); - event.setMaterial(SterlingSilver).tool().toolDamage(2).toolSpeed(13).toolDurability(128).toolQuality(2).build(); - event.setMaterial(StainlessSteel).tool().toolDamage(2).toolSpeed(7).toolDurability(480).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build(); - event.setMaterial(Tritanium).tool().toolDamage(9).toolSpeed(15).toolDurability(9400).toolQuality(6).build(); - event.setMaterial(TungstenCarbide).tool().toolDamage(4).toolSpeed(10).toolDurability(5120).toolQuality(4).build(); - event.setMaterial(TungstenSteel).tool(TungstenCarbide).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); - event.setMaterial(VanadiumSteel).tool().toolDamage(3).toolSpeed(7).toolDurability(512).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build(); - event.setMaterial(Vibranium).tool().toolDamage(15).toolSpeed(1000).toolDurability(512).toolQuality(15).toolEnchantments(of(Enchantments.BLOCK_FORTUNE, 5, Enchantments.MOB_LOOTING, 10)).build(); - event.setMaterial(WroughtIron).tool(Iron).toolDurability(384).build() - .addArmor(new int[]{2, 6, 5, 2}, 1.0F, 0.0F, 17, of(Enchantments.ALL_DAMAGE_PROTECTION, 1)); - /** - ** Gems - **/ - /** - * Regular - **/ - event.setMaterial(Amber).tool().toolDamage(3).toolSpeed(4).toolDurability(256).toolQuality(3).toolEnchantments(of(Enchantments.SILK_TOUCH, 1)).build(); - event.setMaterial(Amethyst).tool().toolDamage(3).toolSpeed(7).toolDurability(256).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 3)).build() - .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30); - event.setMaterial(Sapphire).tool().toolDamage(3).toolSpeed(7).toolDurability(512).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 3)).build() - .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30).harvestLevel(2); - event.setMaterial(BlueTopaz).tool().toolDamage(3).toolSpeed(7).toolDurability(256).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 5)).build(); - event.setMaterial(GreenSapphire).tool(Sapphire).toolEnchantments(of(Data.IMPLOSION, 3)).build() - .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30) - .harvestLevel(2); - event.setMaterial(Jade).tool().toolDamage(2).toolSpeed(8).toolDurability(512).toolQuality(2).toolEnchantments(of(Enchantments.BLOCK_FORTUNE, 3, Enchantments.MOB_LOOTING, 6, Data.IMPLOSION, 3)).build(); - event.setMaterial(Olivine).tool().toolDamage(2).toolSpeed(7).toolDurability(256).toolQuality(2).toolEnchantments(of(Data.IMPLOSION, 2)).build().harvestLevel(2); - event.setMaterial(Opal).tool(Olivine).toolEnchantments(of(Data.IMPLOSION, 4)).build(); - event.setMaterial(Ruby).tool(Sapphire).toolEnchantments(of(Data.IMPLOSION, 3)).build() - .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30); - event.setMaterial(Tanzanite).tool(Olivine).toolEnchantments(of(Data.IMPLOSION, 4)).build(); - event.setMaterial(Topaz).tool(BlueTopaz).toolEnchantments(of(Data.IMPLOSION, 5)).build(); - /** - * Basic - **/ - event.setMaterial(CertusQuartz).tool(Iron).toolDurability(256).build(); - event.setMaterial(Fluix).tool(Iron).toolDamage(2.4f).toolDurability(768).toolEnchantments(of(Enchantments.MOB_LOOTING, 1, Enchantments.BLOCK_FORTUNE, 1)).build(); - /** - ** Plastic Related - **/ - event.setMaterial(Rubber).tool().toolDamage(-1).toolSpeed(0.15f).toolDurability(256).toolEnchantments(of(Enchantments.KNOCKBACK, 2)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); - event.setMaterial(EpoxyResin).tool().toolSpeed(2.25f).toolDurability(32).toolQuality(1).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); - event.setMaterial(Plastic).tool().toolSpeed(0.3f).toolDurability(256).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 1)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); - event.setMaterial(PolyvinylChloride).tool().toolSpeed(0.3f).toolDurability(256).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 1)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); - event.setMaterial(SiliconeRubber).tool().toolSpeed(0.3f).toolDurability(1024).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 2)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); - event.setMaterial(StyreneButadieneRubber).tool().toolSpeed(0.3f).toolDurability(1024).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 2)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); - } - - - private static void nuclearIsotopes(GregTechMaterialEvent event){ - /** - *** Isotopes (Solids) - **/ - event.setMaterial(Cobalt60).asMetal(1768, ROD); - event.setMaterial(Thorium230).asMetal(2028, 0, ROD); - event.setMaterial(Uranium233).asMetal(1406, ROD); - event.setMaterial(Uranium235).asMetal(1406, ROD); - event.setMaterial(Plutonium239).asMetal(912, ROD); - event.setMaterial(Plutonium241).asMetal(912, ROD); - event.setMaterial(Plutonium243).asMetal(912, ROD); - event.setMaterial(Americium241).asMetal(1449, ROD); - event.setMaterial(Americium242).asMetal(1449, ROD); - /** - *** Isotopes (Fluids) - **/ - /** - *** Isotopes (Gases/Plasmas) - **/ - event.setMaterial(HotHelium).asGas(0, 1150).fluidDensity(1000); - event.setMaterial(Deuterium).asGas().fluidDensity(-1112); - event.setMaterial(Tritium).asGas().fluidDensity(-1112); - event.setMaterial(Helium3).asGas().fluidDensity(-560); - /** - * Tetrafluorides - */ - event.setMaterial(UraniumTetrafluoride).asDust().mats(of(Uranium,1,Fluorine,4)); - event.setMaterial(Uranium235Tetrafluoride).asDust().mats(of(Uranium235, 1, Fluorine, 4)); - event.setMaterial(Uranium238Tetrafluoride).asDust().mats(of(Uranium, 1, Fluorine, 4)); - /** - * Hexafluorides - */ - event.setMaterial(UraniumHexafluoride).asGas().fluidDensity(2708); - event.setMaterial(Uranium238Hexafluoride).asGas().mats(of(Uranium,1,Fluorine,6)).fluidDensity(2708); - event.setMaterial(Uranium235Hexafluoride).asGas().mats(of(Uranium235,1,Fluorine,6)).fluidDensity(2708); - } - - - private static void workbenches(GregTechMaterialEvent event){ - METAL.all().forEach(m -> { - if ((m.getElement() == null || !m.getElement().isIsotope) && m.has(PLATE) && m.has(ROD)){ - - GTCoreBlocks.createWorkbench(m, false); - GTCoreBlocks.createWorkbench(m, true); - GTCoreBlocks.createLocker(m, false); - GTCoreBlocks.createLocker(m, true); - if (m != GTCoreMaterials.Ironwood) { - GTCoreBlocks.createMassStorage(m, 1000000); - } - GTCoreBlocks.createChest(m, true); - m.flags(RING, SCREW); - GTCoreBlocks.createBarrel(m, true); - } - }); - } - - public static void byproducts(GregTechMaterialEvent event){ - event.setMaterial(Almandine).addByProduct(RedGarnet, Alumina); - event.setMaterial(Alumina).addByProduct(Bauxite); - //event.setMaterial(Amber).addByProduct(Amber); TODO: Add Amber - event.setMaterial(Amethyst).addByProduct(Amethyst); - event.setMaterial(Monazite).addByProduct(Thorium, Neodymium, RareEarth); - event.setMaterial(Apatite).addByProduct(TricalciumPhosphate, Fluorite); - event.setMaterial(Andradite).addByProduct(YellowGarnet, Iron, Boron); - event.setMaterial(Antimony).addByProduct(Zinc, Iron); - event.setMaterial(Ash).addByProduct(Carbon); - event.setMaterial(Basalt).addByProduct(Olivine, DarkAsh); - event.setMaterial(Bastnasite).addByProduct(Neodymium, RareEarth); - event.setMaterial(Bauxite).addByProduct(Grossular, Rutile, Gallium); - event.setMaterial(Bentonite).addByProduct(Alumina, Calcium, Magnesium).elecTicks(480); - event.setMaterial(Beryllium).addByProduct(Emerald); - event.setMaterial(BlackGranite).addByProduct(Biotite); - event.setMaterial(Sapphire).addByProduct(Alumina); - event.setMaterial(GreenSapphire).addByProduct(Alumina); - event.setMaterial(Brass).addByProduct(Copper, Tin); - event.setMaterial(Bronze).addByProduct(Copper, Zinc); - event.setMaterial(BrownLimonite).addByProduct(Malachite, YellowLimonite); - event.setMaterial(Calcite).addByProduct(Andradite, Malachite); - event.setMaterial(Cassiterite).addByProduct(Tin); - event.setMaterial(Chalcopyrite).addByProduct(Pyrite, Cobalt, Cadmium).bathMercury(Gold).bathPersulfate(Cobalt); - event.setMaterial(Chromium).addByProduct(Iron, Magnesium); - event.setMaterial(Chromite).addByProduct(Iron, Magnesium); - event.setMaterial(Cinnabar).addByProduct(Redstone, Sulfur, Glowstone); - event.setMaterial(Clay).addByProduct(Clay); - event.setMaterial(Coal).addByProduct(Lignite, Thorium); - event.setMaterial(Cobalt).addByProduct(Cobaltite); - event.setMaterial(Cobaltite).addByProduct(Cobalt, Cobalt); - event.setMaterial(Copper).addByProduct(Cobalt, Gold, Nickel).bathMercury(Gold).bathPersulfate(Copper); - event.setMaterial(DarkAsh).addByProduct(Carbon); - event.setMaterial(Diamond).addByProduct(Graphite); - event.setMaterial(Electrum).addByProduct(Gold, Silver); - event.setMaterial(Emerald).addByProduct(Beryllium, Alumina); - event.setMaterial(Endstone).addByProduct(Helium3); - event.setMaterial(EnrichedNaquadah).addByProduct(Naquadah, Naquadria); - event.setMaterial(Flint).addByProduct(Obsidian); - event.setMaterial(Galena).addByProduct(Sulfur, Silver, Lead).bathMercury(Silver); - event.setMaterial(Garnierite).addByProduct(Nickel).bathPersulfate(Nickel); - event.setMaterial(Glauconite).addByProduct(Sodium, Alumina, Iron); - event.setMaterial(Glowstone).addByProduct(Redstone, Gold); - event.setMaterial(Gold).addByProduct(Copper, Nickel).bathMercury(Gold).bathPersulfate(Copper); - event.setMaterial(Graphite).addByProduct(Carbon); - event.setMaterial(Grossular).addByProduct(YellowGarnet, Calcium); - event.setMaterial(Ilmenite).addByProduct(Iron, Rutile); - event.setMaterial(Iridium).addByProduct(Platinum, Osmium).bathMercury(Platinum); - event.setMaterial(Iron).addByProduct(Nickel, Tin).bathPersulfate(Nickel); - event.setMaterial(Lapis).addByProduct(Calcite, Pyrite); - event.setMaterial(Lead).addByProduct(Silver, Sulfur).bathMercury(Silver); - event.setMaterial(Lepidolite).addByProduct(Lithium, Caesium, Boron); - event.setMaterial(Lignite).addByProduct(Coal); - event.setMaterial(Magnesite).addByProduct(Magnesium); - event.setMaterial(Magnesium).addByProduct(Olivine); - event.setMaterial(Magnetite).addByProduct(Iron, Gold).bathMercury(Gold); - event.setMaterial(Malachite).addByProduct(Copper, BrownLimonite, Calcite).bathPersulfate(Copper); - event.setMaterial(Manganese).addByProduct(Chromium, Iron); - event.setMaterial(Marble).addByProduct(Calcite); - event.setMaterial(Molybdenite).addByProduct(Powellite, Scheelite, Wulfenite, Osmium); - event.setMaterial(Molybdenum).addByProduct(Powellite, Scheelite, Wulfenite, Osmium); - event.setMaterial(Naquadah).addByProduct(EnrichedNaquadah); - event.setMaterial(Neodymium).addByProduct(RareEarth); - event.setMaterial(Netherrack).addByProduct(Sulfur); - event.setMaterial(Neutronium).addByProduct(Neutronium); - event.setMaterial(Nickel).addByProduct(Cobalt, Platinum, Iron).bathMercury(Platinum).bathPersulfate(Nickel); - event.setMaterial(Obsidian).addByProduct(Olivine); - event.setMaterial(Olivine).addByProduct(Pyrope, Magnesium); - event.setMaterial(Opal).addByProduct(Tanzanite); - event.setMaterial(Osmium).addByProduct(Iridium).bathMercury(Osmium); - event.setMaterial(Pentlandite).addByProduct(Iron, Sulfur, Cobalt).bathPersulfate(Cobalt); - event.setMaterial(Phosphate).addByProduct(Phosphor); - event.setMaterial(Phosphor).addByProduct(Phosphate); - event.setMaterial(TricalciumPhosphate).addByProduct(Phosphate, Fluorite); - event.setMaterial(Pitchblende).addByProduct(Lead, Thorium, RareEarth); - event.setMaterial(Platinum).addByProduct(Nickel, Iridium).bathMercury(Platinum).bathPersulfate(Nickel); - event.setMaterial(Plutonium).addByProduct(Uranium, Lead); - event.setMaterial(Powellite).addByProduct(Molybdenite, Scheelite); - event.setMaterial(Pyrite).addByProduct(Sulfur, TricalciumPhosphate, Iron); - event.setMaterial(Pyrolusite).addByProduct(Manganese); - event.setMaterial(Pyrope).addByProduct(RedGarnet, Magnesium); - event.setMaterial(Rutile).addByProduct(Hematite, Zircon); - event.setMaterial(Zircon).addByProduct(Rutile, Hafnium, Uraninite); - event.setMaterial(Quartz).addByProduct(Netherrack); - event.setMaterial(MilkyQuartz).addByProduct(Barite); - event.setMaterial(RedGarnet).addByProduct(Spessartine, Pyrope, Almandine); - event.setMaterial(Redstone).addByProduct(Cinnabar, RareEarth, Glowstone); - event.setMaterial(RedGranite).addByProduct(PotassiumFeldspar); - event.setMaterial(RockSalt).addByProduct(Salt); - event.setMaterial(Ruby).addByProduct(Chromium, RedGarnet); - event.setMaterial(Salt).addByProduct(RockSalt); - event.setMaterial(Saltpeter).addByProduct(Saltpeter); - event.setMaterial(Scheelite).addByProduct(Manganese, Molybdenum, Calcium).elecTicks(120); //1920 eu/tick - event.setMaterial(Sheldonite).addByProduct(Palladium, Nickel, Iridium).bathMercury(Sheldonite).bathPersulfate(Nickel); - event.setMaterial(Silicon).addByProduct(SiliconDioxide); - event.setMaterial(Silver).addByProduct(Lead, Sulfur).bathMercury(Silver); - event.setMaterial(Sodalite).addByProduct(Lazurite, Lapis); - event.setMaterial(Sperrylite).addByProduct(Antimony, Copper, Sheldonite, Hematite).bathMercury(Sheldonite).bathPersulfate(Copper); - event.setMaterial(Spessartine).addByProduct(RedGarnet, Manganese); - event.setMaterial(Sphalerite).addByProduct(YellowGarnet, Cadmium, Indium, Zinc).bathPersulfate(Zinc); - event.setMaterial(Spodumene).addByProduct(Alumina, Lithium); - event.setMaterial(Steel).addByProduct(Iron); - event.setMaterial(Stibnite).addByProduct(Antimony); - event.setMaterial(Sulfur).addByProduct(Sulfur); - event.setMaterial(Tantalite).addByProduct(Manganese, Niobium, Tantalum); - event.setMaterial(Tanzanite).addByProduct(Opal); - event.setMaterial(Tetrahedrite).addByProduct(Antimony, Zinc).bathPersulfate(Tetrahedrite); - event.setMaterial(Thorium).addByProduct(Lead, Thorium, Indium); - event.setMaterial(Tin).addByProduct(Iron, Zinc).bathPersulfate(Zinc); - event.setMaterial(Titanium).addByProduct(Almandine); - event.setMaterial(Tungstate).addByProduct(Manganese, Silver, Lithium).bathMercury(Silver); - event.setMaterial(Tungsten).addByProduct(Manganese, Molybdenum); - event.setMaterial(Uraninite).addByProduct(Lead, Thorium, RareEarth); - event.setMaterial(Uvarovite).addByProduct(YellowGarnet, Chromium); - event.setMaterial(VanadiumMagnetite).addByProduct(Magnetite, Vanadium); - event.setMaterial(Wulfenite).addByProduct(Powellite/*, Sheelite*/, Molybdenite, Galena); - event.setMaterial(YellowGarnet).addByProduct(Andradite, Grossular, Uvarovite); - event.setMaterial(YellowLimonite).addByProduct(Nickel, BrownLimonite, Cobalt).bathPersulfate(Nickel); - event.setMaterial(Zinc).addByProduct(Tin, Gallium).bathPersulfate(Zinc); - } - - private static void flags(GregTechMaterialEvent event){ - BRITTLEG.add(Coal, Charcoal, Lignite, PetroleumCoke, CoalCoke, LigniteCoke); - CALCITE2X.add(Pyrite, YellowLimonite); - CALCITE3X.add(Iron, BrownLimonite); - CENT5.add(/*Chrysolite*/ Flint, /*Niter*/ Glass, /*Perlite*/ WroughtIron, DarkAsh, AnnealedCopper, - Cinnabar); - CENT10.add(Magnalium, VanadiumMagnetite, BrownLimonite, YellowLimonite, BlackGranite, Cupronickel, NiobiumTitanium, BorosilicateGlass, - GalliumArsenide, Marble, Limestone, Invar, TinAlloy, TungstenCarbide, EnderEye, Powellite, VanadiumGallium, Blaze, - TungstenSteel, Brass, Nichrome, Electrum, Bronze, Stibnite, Wulfenite, RedAlloy, SterlingSilver, RoseGold, BatteryAlloy, SolderingAlloy, TricalciumPhosphate); - CENT15.add(Kanthal, IndiumGalliumPhosphide, BlackSteel, RedGarnet, YellowGarnet, BismuthBronze, BlackBronze, VanadiumSteel, CdInAGAlloy, CobaltBrass, - Pitchblende, Redstone, HSSS); - CENT20.add(Lapis, Tetrahedrite, RedSteel, BlueSteel, Basalt, HSSE, Sheldonite, HSSG, Komatiite); - CENT.add(CENT5.all().toArray(new Material[0])); - CENT.add(CENT10.all().toArray(new Material[0])); - CENT.add(CENT15.all().toArray(new Material[0])); - CENT.add(CENT20.all().toArray(new Material[0])); - RECIPE_MASS.add(Lead, 64); - FURNACE_FUELS.add(CoalCoke, GEM, 3200); - FURNACE_FUELS.add(CoalCoke, DUST, 3200); - FURNACE_FUELS.add(CoalCoke, BLOCK, 32000); - FURNACE_FUELS.add(Lignite, GEM, 800); - FURNACE_FUELS.add(Lignite, DUST, 800); - FURNACE_FUELS.add(Lignite, RAW_ORE, 800); - FURNACE_FUELS.add(Lignite, CRUSHED, 900); - FURNACE_FUELS.add(Lignite, CRUSHED_PURIFIED, 1000); - FURNACE_FUELS.add(Lignite, DUST_IMPURE, 800); - FURNACE_FUELS.add(Lignite, DUST_PURE, 800); - FURNACE_FUELS.add(Lignite, CRUSHED_REFINED, 1100); - FURNACE_FUELS.add(Lignite, BLOCK, 8000); - FURNACE_FUELS.add(LigniteCoke, GEM, 1600); - FURNACE_FUELS.add(LigniteCoke, DUST, 1600); - FURNACE_FUELS.add(LigniteCoke, BLOCK, 16000); - FURNACE_FUELS.add(PetroleumCoke, GEM, 6400); - FURNACE_FUELS.add(PetroleumCoke, DUST, 6400); - FURNACE_FUELS.add(PetroleumCoke, BLOCK, 64000); - FURNACE_FUELS.add(Coal, DUST, 1600); - FURNACE_FUELS.add(Coal, RAW_ORE, 1600); - FURNACE_FUELS.add(Coal, CRUSHED, 1800); - FURNACE_FUELS.add(Coal, CRUSHED_PURIFIED, 2000); - FURNACE_FUELS.add(Coal, DUST_IMPURE, 1600); - FURNACE_FUELS.add(Coal, DUST_PURE, 1600); - FURNACE_FUELS.add(Coal, CRUSHED_REFINED, 2200); - FURNACE_FUELS.add(Charcoal, DUST, 1600); - FURNACE_FUELS.add(Charcoal, BLOCK, 16000); - FURNACE_FUELS.add(OilShale, DUST, 400); - FURNACE_FUELS.add(OilShale, RAW_ORE, 400); - RADIOACTIVE.add(Cobalt60, 2); - RADIOACTIVE.add(Astatine, 4); - RADIOACTIVE.add(Uranium235, 2); - RADIOACTIVE.add(Plutonium, 1); - RADIOACTIVE.add(Plutonium241, 3); - RADIOACTIVE.add(Plutonium243, 3); - RADIOACTIVE.add(Americium241, 4); - RADIOACTIVE.add(EnrichedNaquadah, 4); - RADIOACTIVE.add(Naquadria, 5); - CRACK.add(RefineryGas, Naphtha, Ethane, Ethylene, Propane, Propene, Butane, Butene, Butadiene); - CRYSTALLIZE.add(Lapis, Lazurite, Sodalite, MilkyQuartz, Quartz, CertusQuartz, Fluix, Jade, Amber, Apatite, Flint, EnderEye, EnderPearl); - NON_GEMS.add(Coal, Charcoal, Lignite, CoalCoke, LigniteCoke, PetroleumCoke); - ELEC30.add(Charcoal, Opal, Coal, CoalCoke, Lignite, SteelMagnetic, IronMagnetic, Quicklime, Quartzite, - SiliconDioxide, Wollastonite, CobaltOxide, Garnierite, CupricOxide, RockSalt, /*Zincite,*/Pyrolusite, /*ChromiumDioxide,*/ - Phosphate, /*NiobiumNitride,*/ GreenSapphire, Sapphire, NeodymiumMagnetic, Cassiterite, - PhosphorousPentoxide, Hematite, Massicot, ArsenicTrioxide, Sugar, Magnetite, AntimonyTrioxide, - Salt, SodiumBisulfate, PotassiumBisulfate, HydrochloricAcid, SaltWater, HydrochloricAcid, Diamond, - NickelSulfate, Water, DistilledWater, HeavyWater, SemiheavyWater, TritiatedWater, MilkyQuartz, FerricChloride, Sperrylite, LithiumChloride); - ELEC60.add(CalciumChloride, SodiumHydroxide, Propene, Ethylene, Butene, Benzene, Styrene, Ethane, Ammonia, SodiumSulfide, Methane, - Magnesite, HydrofluoricAcid, HydrogenFluoride, Sphalerite, /*NitroCarbon,*/ SodaAsh, Calcite, Saltpeter, Monazite, - /*Wollastonite,*/ NitrogenMonoxide, Butane, CarbonMonoxide, Pyrite, RedGranite, Ferrosilite, Butadiene, Amethyst, - Molybdenite, Ruby, /*Kyanite,*/ NitrogenDioxide, DinitrogenTetroxide, Propane, Barite, Isoprene, - Chromite, EnderPearl, SiliconDioxide, Apatite, SulfurTrioxide, /*Pyrochlore, */ Toluene, Phosphate, - Tantalite, PhosphorousPentoxide, Osmiridium, Pentlandite, Steel, Graphite, MagnesiumChloride); - ELEC90.add(Polydimethylsiloxane, AceticAcid, Olivine, Ethanol, Methanol, VinylAcetate, /*Gypsum,*/ Cobaltite, - /*Dymethylamine,*/ Chalcopyrite, /*Mirabilite,*/ Spodumene, /*Dolomite,*/ HypochlorousAcid, Chloramine, Bastnasite, - Chloromethane, Malachite, /*Borax, */ /*Kaolinite,*/ Obsidian, NitricAcid, VinylChloride, Acetone, /*Asbestos,*/ PotassiumFeldspar, - MethylAcetate, Sodalite, AllylChloride, Phenol, Glycerol, Talc, Soapstone, PhosphoricAcid, - Chlorobenzene, SulfuricAcid, Pyrope, SodiumPersulfate, Chloroform, Grossular, Spessartine, Almandine, Uvarovite, Andradite, - Emerald, Galena, Zircon); - ELEC120.add(Clay, /*Trona,*/ BlueTopaz, Topaz, /*Pollucite,*/ CarbonDioxide, SulfurDioxide, Epichlorohydrin, Lepidolite, /*FullersEarth, Alunite,*/ Glauconite, - /*Mica,*/ Lazurite, Tanzanite, Biotite, StainlessSteel, Ultimet, CalciumAcetateSolution, Dimethyldichlorosilane, /*Vermiculate, Zeolite,*/ GlycerylTrinitrate); - ELEC.add(ELEC30.all().toArray(new Material[0])); - ELEC.add(ELEC60.all().toArray(new Material[0])); - ELEC.add(ELEC90.all().toArray(new Material[0])); - ELEC.add(ELEC120.all().toArray(new Material[0])); - ELEC_CIRCUIT.add(Water, DistilledWater, SodiumBisulfate); - ELECSEPG.add(VanadiumMagnetite, Magnetite); - ELECSEPI.add(YellowLimonite, BrownLimonite, Tin, Chromium, Ilmenite, Hematite, Pyrite, Glauconite, Nickel, Chromite, Pentlandite, Manganese); - ELECSEPN.add(Monazite, Bastnasite); - GRINDABLE.add(/* Paper, */Coal, Charcoal, Lignite, Lead, Tin, SolderingAlloy, Flint, Gold, Silver, Iron, - IronMagnetic, Steel, SteelMagnetic, Zinc, Antimony, Copper, AnnealedCopper, Bronze, Nickel, Invar, - Brass, WroughtIron, Electrum, Clay, Blaze); - NOBBF.add(Tetrahedrite, Chalcopyrite, Sheldonite, Pyrolusite, Magnesite, Molybdenite, Galena); - NOSMASH.add(Wood/* WoodSealed */, Sulfur, Saltpeter, Graphite, /* Paper, */Coal, Charcoal, Lignite, PetroleumCoke, Rubber, - StyreneButadieneRubber, Plastic, PolyvinylChloride, Polystyrene, SiliconeRubber, Polytetrafluoroethylene, NitroDiesel, - Concrete, Redstone, Glowstone, Netherrack, Stone, Brick, Endstone, Marble, Basalt, Obsidian, Flint, - RedGranite, BlackGranite, Salt, RockSalt, Glass, Diamond, Emerald, Amethyst, Tanzanite, Topaz, - /* Amber, */ Sapphire, Ruby, Opal, Olivine, Lapis, MilkyQuartz, Quartz, Phosphate, EnderPearl, EnderEye, Silicon); - NOSMELT.add(Wood/* , WoodSealed */, Sulfur, Saltpeter, Graphite, /* Paper, */Coal, Charcoal, Lignite, - NitroDiesel, Emerald, Amethyst, Tanzanite, Topaz, /* Amber, */ Sapphire, Ruby, Opal, Olivine, - Lapis, Sodalite, Lazurite, Monazite , MilkyQuartz, Quartz, TricalciumPhosphate, Phosphate, - EnderPearl, EnderEye, Blaze); - RUBBERTOOLS.add(Rubber, StyreneButadieneRubber, Plastic, PolyvinylChloride, Polytetrafluoroethylene, SiliconeRubber, EpoxyResin); - SMELTF.add(Concrete, Redstone, Glowstone, Glass, Blaze); - SOLDER.add(Lead, Tin, SolderingAlloy); - SOLDER.subTag(SubTag.BAD_SOLDER, Lead, Tin); - SOLDER.subTag(SubTag.GOOD_SOLDER, SolderingAlloy, Tin); - WIRE.subTag(SubTag.COPPER_WIRE, AnnealedCopper); - WIRE.subTag(SubTag.COPPER_WIRE, Copper); - CABLE.subTag(SubTag.COPPER_CABLE, AnnealedCopper); - CABLE.subTag(SubTag.COPPER_CABLE, Copper); - - event.setMaterial(AnnealedCopper).setDirectSmeltInto(Copper).setMacerateInto(Copper); - event.setMaterial(Copper).setArcSmeltInto(AnnealedCopper); - event.setMaterial(Iron).setArcSmeltInto(WroughtIron); - event.setMaterial(IronMagnetic).setDirectSmeltInto(Iron).setMacerateInto(Iron).setArcSmeltInto(WroughtIron); - event.setMaterial(NeodymiumMagnetic).setDirectSmeltInto(Neodymium).setMacerateInto(Neodymium).setArcSmeltInto(Neodymium); - event.setMaterial(SteelMagnetic).setDirectSmeltInto(Steel).setMacerateInto(Steel).setArcSmeltInto(Steel); - event.setMaterial(WroughtIron).setDirectSmeltInto(Iron).setMacerateInto(Iron); - - /*event.setMaterial(BandedIron).setDirectSmeltInto(Iron); - event.setMaterial(BrownLimonite).setDirectSmeltInto(Iron); - event.setMaterial(Cassiterite).setDirectSmeltInto(Tin); - event.setMaterial(Chalcopyrite).setDirectSmeltInto(Copper); - event.setMaterial(Cinnabar).setDirectSmeltInto(Mercury); - event.setMaterial(Cobaltite).setDirectSmeltInto(Cobalt); - event.setMaterial(Cooperite).setDirectSmeltInto(Platinum); - event.setMaterial(Galena).setDirectSmeltInto(Lead); - event.setMaterial(Garnierite).setDirectSmeltInto(Nickel); - event.setMaterial(Magnesite).setDirectSmeltInto(Magnesium); - event.setMaterial(Magnetite).setDirectSmeltInto(Iron); - event.setMaterial(Malachite).setDirectSmeltInto(Copper); - event.setMaterial(Molybdenite).setDirectSmeltInto(Molybdenum); - event.setMaterial(Pentlandite).setDirectSmeltInto(Nickel); - event.setMaterial(Pyrite).setDirectSmeltInto(Iron); - event.setMaterial(Pyrolusite).setDirectSmeltInto(Manganese); - event.setMaterial(Sphalerite).setDirectSmeltInto(Zinc); - event.setMaterial(Stibnite).setDirectSmeltInto(Antimony); - event.setMaterial(Tetrahedrite).setDirectSmeltInto(Copper); - event.setMaterial(YellowLimonite).setDirectSmeltInto(Iron);*/ - - event.setMaterial(Cassiterite).setOreMulti(2).setSmeltingMulti(2); - event.setMaterial(Glowstone).setOreMulti(5).setSmeltingMulti(5); - event.setMaterial(Lapis).setOreMulti(6).setSmeltingMulti(6).setByProductMulti(4); - event.setMaterial(TricalciumPhosphate).setOreMulti(3).setSmeltingMulti(3); - event.setMaterial(Quartz).setOreMulti(2).setSmeltingMulti(2); - event.setMaterial(Redstone).setOreMulti(5).setSmeltingMulti(5); - event.setMaterial(RockSalt).setOreMulti(2).setSmeltingMulti(2); - event.setMaterial(Salt).setOreMulti(2).setSmeltingMulti(2); - event.setMaterial(Saltpeter).setOreMulti(4).setSmeltingMulti(4); - event.setMaterial(Scheelite).setOreMulti(2).setSmeltingMulti(2); - event.setMaterial(Tungstate).setOreMulti(2).setSmeltingMulti(2); - event.setMaterial(Monazite).setOreMulti(8); - event.setMaterial(Apatite).setOreMulti(4); - event.setMaterial(CertusQuartz).setOreMulti(2); - event.setMaterial(Lazurite).setOreMulti(6); - event.setMaterial(Sodalite).setOreMulti(6); - event.setMaterial(TricalciumPhosphate).setOreMulti(3); - - // Plastic.setEnchantmentForTools(Enchantment.knockback, 1); - // PolyvinylChloride.setEnchantmentForTools(Enchantment.knockback, 1); - // Polystyrene.setEnchantmentForTools(Enchantment.knockback, 1); - // Rubber.setEnchantmentForTools(Enchantment.knockback, 2); - // StyreneButadieneRubber.setEnchantmentForTools(Enchantment.knockback, 2); - // Flint.setEnchantmentForTools(Enchantment.fireAspect, 1); - // Blaze.setEnchantmentForTools(Enchantment.fireAspect, 3); - // EnderPearl.setEnchantmentForTools(Enchantment.silkTouch, 1); - // NetherStar.setEnchantmentForTools(Enchantment.silkTouch, 1); - // BlackBronze.setEnchantmentForTools(Enchantment.smite, 2); - // Gold.setEnchantmentForTools(Enchantment.smite, 3); - // RoseGold.setEnchantmentForTools(Enchantment.smite, 4); - // Platinum.setEnchantmentForTools(Enchantment.smite, 5); - // Lead.setEnchantmentForTools(Enchantment.baneOfArthropods, 2); - // Nickel.setEnchantmentForTools(Enchantment.baneOfArthropods, 2); - // Invar.setEnchantmentForTools(Enchantment.baneOfArthropods, 3); - // Antimony.setEnchantmentForTools(Enchantment.baneOfArthropods, 3); - // BatteryAlloy.setEnchantmentForTools(Enchantment.baneOfArthropods, 4); - // Bismuth.setEnchantmentForTools(Enchantment.baneOfArthropods, 4); - // BismuthBronze.setEnchantmentForTools(Enchantment.baneOfArthropods, 5); - // Iron.setEnchantmentForTools(Enchantment.sharpness, 1); - // Bronze.setEnchantmentForTools(Enchantment.sharpness, 1); - // Brass.setEnchantmentForTools(Enchantment.sharpness, 2); - // Steel.setEnchantmentForTools(Enchantment.sharpness, 2); - // WroughtIron.setEnchantmentForTools(Enchantment.sharpness, 2); - // StainlessSteel.setEnchantmentForTools(Enchantment.sharpness, 3); - // BlackSteel.setEnchantmentForTools(Enchantment.sharpness, 4); - // RedSteel.setEnchantmentForTools(Enchantment.sharpness, 4); - // BlueSteel.setEnchantmentForTools(Enchantment.sharpness, 5); - // DamascusSteel.setEnchantmentForTools(Enchantment.sharpness, 5); - // TungstenCarbide.setEnchantmentForTools(Enchantment.sharpness, 5); - // HSSE.setEnchantmentForTools(Enchantment.sharpness, 5); - // HSSG.setEnchantmentForTools(Enchantment.sharpness, 4); - // HSSS.setEnchantmentForTools(Enchantment.sharpness, 5); - // Lava.setTemperatureDamage(3.0F); - - - // Glue.mChemicalFormula = "No Horses were harmed for the Production"; - // UUAmplifier.mChemicalFormula = "Accelerates the Mass Fabricator"; - // WoodSealed.mChemicalFormula = ""; - // Wood.mChemicalFormula = ""; - - // Naquadah.mMoltenRGBa[0] = 0; - // Naquadah.mMoltenRGBa[1] = 255; - // Naquadah.mMoltenRGBa[2] = 0; - // Naquadah.mMoltenRGBa[3] = 0; - // NaquadahEnriched.mMoltenRGBa[0] = 64; - // NaquadahEnriched.mMoltenRGBa[1] = 255; - // NaquadahEnriched.mMoltenRGBa[2] = 64; - // NaquadahEnriched.mMoltenRGBa[3] = 0; - // Naquadria.mMoltenRGBa[0] = 128; - // Naquadria.mMoltenRGBa[1] = 255; - // Naquadria.mMoltenRGBa[2] = 128; - // Naquadria.mMoltenRGBa[3] = 0; - - // NaquadahEnriched.mChemicalFormula = "Nq+"; - // Naquadah.mChemicalFormula = "Nq"; - // Naquadria.mChemicalFormula = "NqX"; - } - - private static void antimatterMaterials(GregTechMaterialEvent event){ - event.setMaterial(Basalt).mats(of(Olivine, 1, Calcite, 3, Flint, 8, DarkAsh, 4)); - event.setMaterial(Blaze).mats(of(Sulfur, 1, DarkAsh, 1)); - event.setMaterial(Coal).asGemBasic(false).flags(ORE_STONE, ROCK).mats(of(Carbon, 2)); - event.setMaterial(Copper).flags(PLATE, ROD_LONG, FOIL, WIRE_FINE, GEAR, BOLT); - event.setMaterial(Quartz).flags(CHAMBER); - event.setMaterial(Diamond).asGem(true).mats(of(Carbon, 64), 1).elecTicks(768).harvestLevel(3); - event.setMaterial(Emerald).asGem(true).mats(of(Alumina, 5, Beryllium, 3, SiliconDioxide, 18, Oxygen, 3)).elecTicks(540); - //.tool().toolDamage(3).toolSpeed(9).toolDurability(590).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 5)).build(); - event.setMaterial(EnderEye).asGemBasic(false, ROD_LONG, PLATE).mats(of(EnderPearl, 1, Blaze, 1)); - event.setMaterial(EnderPearl).mats(of(Beryllium, 1, Potassium, 4, Nitrogen, 5, Chlorine, 6)).elecTicks(220); - event.setMaterial(Gold).flags(FOIL, ROD_LONG, WIRE_FINE, GEAR); - event.setMaterial(Iron).flags(RING, ROD_LONG, GEAR, FRAME, GEAR_SMALL); - event.setMaterial(Wood).flags(FRAME); - event.setMaterial(AntimatterMaterials.Netherite).asMetal(2246, 1300, RING); - event.setMaterial(Lapis).asGemBasic(false, PLATE).mats(of(Lazurite, 12, Sodalite, 2, Pyrite, 1, Calcite, 1)); - event.setMaterial(Prismarine).mats(of(Potassium, 2, Oxygen, 8, Manganese, 1, Silicon, 5)); - event.setMaterial(Redstone).mats(of(Silicon, 1, Pyrite, 5, Ruby, 1, Mercury, 3)).asFluid(0, MaterialTags.MELTING_POINT.getInt(Redstone));//.setOreMulti(4); - event.setMaterial(Water).mats(of(Hydrogen, 2, Oxygen, 1)).elecTicks(2000); - event.setMaterial(Sugar).mats(of(Water, 11, Carbon, 12)).elecTicks(184); - event.setMaterial(Glowstone).asFluid(0, 1000).flags(MOLTEN); - event.setMaterial(Endstone).flags(ROD_LONG); - event.setMaterial(Flint).mats(of(SiliconDioxide, 1)).elecTicks(80); - } -} \ No newline at end of file diff --git a/common/src/main/java/muramasa/gregtech/loader/SimpleMachineLoader.java b/common/src/main/java/muramasa/gregtech/loader/SimpleMachineLoader.java deleted file mode 100644 index b01450de4..000000000 --- a/common/src/main/java/muramasa/gregtech/loader/SimpleMachineLoader.java +++ /dev/null @@ -1,2 +0,0 @@ -package muramasa.gregtech.loader;public class SimpleMachineLoader { -} diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FermenterLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/FermenterLoader.java deleted file mode 100644 index cea476342..000000000 --- a/common/src/main/java/muramasa/gregtech/loader/machines/FermenterLoader.java +++ /dev/null @@ -1,11 +0,0 @@ -package muramasa.gregtech.loader.machines; - -import static muramasa.gregtech.data.Materials.Biomass; -import static muramasa.gregtech.data.Materials.FermentedBiomass; -import static muramasa.gregtech.data.RecipeMaps.FERMENTER; - -public class FermenterLoader { - public static void init() { - FERMENTER.RB().fi(Biomass.getLiquid(100)).fo(FermentedBiomass.getLiquid(100)).add("fermented_biomass",100,2); - } -} diff --git a/common/src/main/java/muramasa/gregtech/GT5RConfig.java b/common/src/main/java/org/gtreimagined/gt5r/GT5RConfig.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/GT5RConfig.java rename to common/src/main/java/org/gtreimagined/gt5r/GT5RConfig.java index 79599592f..5b8c35314 100644 --- a/common/src/main/java/muramasa/gregtech/GT5RConfig.java +++ b/common/src/main/java/org/gtreimagined/gt5r/GT5RConfig.java @@ -1,4 +1,4 @@ -package muramasa.gregtech; +package org.gtreimagined.gt5r; import carbonconfiglib.config.Config; import carbonconfiglib.config.ConfigEntry; diff --git a/common/src/main/java/muramasa/gregtech/GT5RPostRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/GT5RPostRegistrar.java similarity index 87% rename from common/src/main/java/muramasa/gregtech/GT5RPostRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/GT5RPostRegistrar.java index 3ef4d2938..48138bb16 100644 --- a/common/src/main/java/muramasa/gregtech/GT5RPostRegistrar.java +++ b/common/src/main/java/org/gtreimagined/gt5r/GT5RPostRegistrar.java @@ -1,4 +1,4 @@ -package muramasa.gregtech; +package org.gtreimagined.gt5r; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.event.MaterialEvent; @@ -6,8 +6,8 @@ import muramasa.antimatter.registration.RegistrationEvent; import muramasa.antimatter.registration.Side; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.data.GT5RMaterialEvents; -import muramasa.gregtech.material.GregTechMaterialEvent; +import org.gtreimagined.gt5r.data.GT5RMaterialEvents; +import org.gtreimagined.gt5r.material.GregTechMaterialEvent; public class GT5RPostRegistrar implements IAntimatterRegistrar { public GT5RPostRegistrar(){ diff --git a/common/src/main/java/muramasa/gregtech/GT5RRef.java b/common/src/main/java/org/gtreimagined/gt5r/GT5RRef.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/GT5RRef.java rename to common/src/main/java/org/gtreimagined/gt5r/GT5RRef.java index d05b3a46d..a29d6538a 100644 --- a/common/src/main/java/muramasa/gregtech/GT5RRef.java +++ b/common/src/main/java/org/gtreimagined/gt5r/GT5RRef.java @@ -1,4 +1,4 @@ -package muramasa.gregtech; +package org.gtreimagined.gt5r; import muramasa.antimatter.Ref; diff --git a/common/src/main/java/muramasa/gregtech/GT5Reimagined.java b/common/src/main/java/org/gtreimagined/gt5r/GT5Reimagined.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/GT5Reimagined.java rename to common/src/main/java/org/gtreimagined/gt5r/GT5Reimagined.java index ce2f61776..f35293963 100644 --- a/common/src/main/java/muramasa/gregtech/GT5Reimagined.java +++ b/common/src/main/java/org/gtreimagined/gt5r/GT5Reimagined.java @@ -1,5 +1,21 @@ -package muramasa.gregtech; +package org.gtreimagined.gt5r; +import org.gtreimagined.gt5r.client.GT5RModelManager; +import gtreimagined.gt5r.data.*; +import gtreimagined.gt5r.datagen.*; +import org.gtreimagined.gt5r.data.*; +import org.gtreimagined.gt5r.datagen.*; +import org.gtreimagined.gt5r.loader.crafting.*; +import org.gtreimagined.gt5r.loader.machines.*; +import org.gtreimagined.gt5r.loader.multi.*; +import org.gtreimagined.gt5r.proxy.CommonHandler; +import org.gtreimagined.gt5r.integration.AppliedEnergisticsRegistrar; +import org.gtreimagined.gt5r.integration.SpaceModRegistrar; +import org.gtreimagined.gt5r.integration.rei.REIRegistrar; +import org.gtreimagined.datagen.*; +import org.gtreimagined.gt5r.loader.machines.generator.Fuels; +import org.gtreimagined.gt5r.loader.machines.generator.LargeBoilerLoader; +import org.gtreimagined.gt5r.loader.machines.generator.SolidFuelBoilerLoader; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterMod; import muramasa.antimatter.Ref; @@ -20,27 +36,20 @@ import muramasa.antimatter.registration.Side; import muramasa.antimatter.tool.IAntimatterTool; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.block.BlockAsphalt; -import muramasa.gregtech.client.GT5RModelManager; -import muramasa.gregtech.data.*; -import muramasa.gregtech.datagen.*; -import muramasa.gregtech.integration.AppliedEnergisticsRegistrar; -import muramasa.gregtech.integration.SpaceModRegistrar; -import muramasa.gregtech.integration.rei.REIRegistrar; -import muramasa.gregtech.loader.crafting.*; -import muramasa.gregtech.loader.items.Circuitry; -import muramasa.gregtech.loader.machines.*; -import muramasa.gregtech.loader.machines.generator.Fuels; -import muramasa.gregtech.loader.machines.generator.LargeBoilerLoader; -import muramasa.gregtech.loader.machines.generator.SolidFuelBoilerLoader; -import muramasa.gregtech.loader.multi.*; -import muramasa.gregtech.proxy.CommonHandler; +import org.gtreimagined.gt5r.block.BlockAsphalt; +import muramasa.gt5r.data.*; +import muramasa.gt5r.datagen.*; +import muramasa.gt5r.loader.crafting.*; +import org.gtreimagined.gt5r.loader.items.Circuitry; +import muramasa.gt5r.loader.machines.*; +import muramasa.gt5r.loader.multi.*; import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.level.block.state.BlockState; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.gtreimagined.data.*; import org.gtreimagined.gtcore.data.GTCoreItems; import java.util.Arrays; diff --git a/common/src/main/java/muramasa/gregtech/GTRemapping.java b/common/src/main/java/org/gtreimagined/gt5r/GTRemapping.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/GTRemapping.java rename to common/src/main/java/org/gtreimagined/gt5r/GTRemapping.java index 08eab22ef..1031f6e67 100644 --- a/common/src/main/java/muramasa/gregtech/GTRemapping.java +++ b/common/src/main/java/org/gtreimagined/gt5r/GTRemapping.java @@ -1,4 +1,4 @@ -package muramasa.gregtech; +package org.gtreimagined.gt5r; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import muramasa.antimatter.AntimatterAPI; @@ -10,7 +10,7 @@ import java.util.Map; -import static muramasa.gregtech.data.Machines.*; +import static org.gtreimagined.gt5r.data.Machines.*; public class GTRemapping { private static final Map REMAPPING_MAP = new Object2ObjectArrayMap<>(); diff --git a/common/src/main/java/muramasa/gregtech/block/BlockAsphalt.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphalt.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/block/BlockAsphalt.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphalt.java index 1b46758c1..cd37ff73a 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockAsphalt.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphalt.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.registration.IColorHandler; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockAsphaltSlab.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphaltSlab.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/block/BlockAsphaltSlab.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphaltSlab.java index 439047b9f..32e20b4d8 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockAsphaltSlab.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphaltSlab.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.block.BlockBasicSlab; import muramasa.antimatter.registration.IColorHandler; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockAsphaltStair.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphaltStair.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/block/BlockAsphaltStair.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphaltStair.java index b717df39c..3ba18f886 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockAsphaltStair.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockAsphaltStair.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.block.BlockBasicStair; import muramasa.antimatter.registration.IColorHandler; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockCasing.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockCasing.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/block/BlockCasing.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockCasing.java index 1ce94d74f..b67778ee2 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockCasing.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockCasing.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockCoil.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockCoil.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/block/BlockCoil.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockCoil.java index f5798dab1..7b5ff1359 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockCoil.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockCoil.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.texture.Texture; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockColoredWall.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockColoredWall.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/block/BlockColoredWall.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockColoredWall.java index 10a3d35da..b208f7227 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockColoredWall.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockColoredWall.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.block.BlockFakeTile; import muramasa.antimatter.material.Material; import muramasa.antimatter.registration.IColorHandler; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockFakeCasing.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockFakeCasing.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/block/BlockFakeCasing.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockFakeCasing.java index ac7988723..6be7d2989 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockFakeCasing.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockFakeCasing.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; import muramasa.antimatter.block.BlockFakeTile; import muramasa.antimatter.texture.Texture; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockMiningPipe.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockMiningPipe.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/block/BlockMiningPipe.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockMiningPipe.java index fa78f275f..891844109 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockMiningPipe.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockMiningPipe.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.Materials; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.registration.IColorHandler; import muramasa.antimatter.registration.IItemBlockProvider; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.GT5RBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockPowderBarrel.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockPowderBarrel.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/block/BlockPowderBarrel.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockPowderBarrel.java index 49844ea37..3e6dea1ee 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockPowderBarrel.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockPowderBarrel.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; diff --git a/common/src/main/java/muramasa/gregtech/block/BlockSidedCasing.java b/common/src/main/java/org/gtreimagined/gt5r/block/BlockSidedCasing.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/block/BlockSidedCasing.java rename to common/src/main/java/org/gtreimagined/gt5r/block/BlockSidedCasing.java index 320bf1b35..0a2bbe476 100644 --- a/common/src/main/java/muramasa/gregtech/block/BlockSidedCasing.java +++ b/common/src/main/java/org/gtreimagined/gt5r/block/BlockSidedCasing.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.block; +package org.gtreimagined.gt5r.block; import muramasa.antimatter.texture.Texture; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniEndPortal.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniEndPortal.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniEndPortal.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniEndPortal.java index 206641b3d..dbb1da05a 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniEndPortal.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniEndPortal.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.miniportals; +package org.gtreimagined.gt5r.blockentity.miniportals; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniNetherPortal.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniNetherPortal.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniNetherPortal.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniNetherPortal.java index 56a1f57c2..e423a30ea 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniNetherPortal.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniNetherPortal.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.miniportals; +package org.gtreimagined.gt5r.blockentity.miniportals; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniPortal.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniPortal.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniPortal.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniPortal.java index c5e7f952e..9582fb468 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniPortal.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniPortal.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.miniportals; +package org.gtreimagined.gt5r.blockentity.miniportals; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.blockentity.IExtendingBlockEntity; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniTwilightPortal.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniTwilightPortal.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniTwilightPortal.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniTwilightPortal.java index d58b78055..1fd1763b9 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/miniportals/BlockEntityMiniTwilightPortal.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/miniportals/BlockEntityMiniTwilightPortal.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.blockentity.miniportals; +package org.gtreimagined.gt5r.blockentity.miniportals; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.tool.AntimatterToolType; -import muramasa.gregtech.loader.WorldGenLoader; +import org.gtreimagined.gt5r.loader.WorldGenLoader; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityAdvancedMiner.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityAdvancedMiner.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityAdvancedMiner.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityAdvancedMiner.java index 599ebcf32..639c549da 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityAdvancedMiner.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityAdvancedMiner.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCharcoalPit.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCharcoalPit.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCharcoalPit.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCharcoalPit.java index 38bfebaaf..c2649ddec 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCharcoalPit.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCharcoalPit.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.machine.MachineState; @@ -7,8 +7,8 @@ import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.util.Utils; import muramasa.antimatter.util.int3; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.Machines; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.Machines; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCokeOven.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCokeOven.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCokeOven.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCokeOven.java index 91825aa3b..d892eda23 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCokeOven.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCokeOven.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCombustionEngine.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCombustionEngine.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCombustionEngine.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCombustionEngine.java index eaf4b2b89..58b807329 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityCombustionEngine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityCombustionEngine.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; @@ -19,8 +19,8 @@ import java.util.List; import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT; -import static muramasa.gregtech.data.Materials.Lubricant; -import static muramasa.gregtech.data.Materials.Oxygen; +import static org.gtreimagined.gt5r.data.Materials.Lubricant; +import static org.gtreimagined.gt5r.data.Materials.Oxygen; public class BlockEntityCombustionEngine extends BlockEntityMultiMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityDistillationTower.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityDistillationTower.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityDistillationTower.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityDistillationTower.java index d6ee095bf..b6669dc1b 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityDistillationTower.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityDistillationTower.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.capability.IComponentHandler; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityElectricBlastFurnace.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityElectricBlastFurnace.java index 0dc000a62..6af7bd242 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityElectricBlastFurnace.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityElectricBlastFurnace.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; @@ -6,7 +6,7 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.block.BlockCoil; +import org.gtreimagined.gt5r.block.BlockCoil; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityFusionReactor.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityFusionReactor.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityFusionReactor.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityFusionReactor.java index d0141f617..ae697a2c5 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityFusionReactor.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityFusionReactor.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; @@ -12,7 +12,7 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; +import org.gtreimagined.gt5r.GT5RRef; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -22,8 +22,8 @@ import net.minecraft.world.level.block.state.BlockState; import tesseract.TesseractGraphWrappers; -import static muramasa.gregtech.data.Materials.DistilledWater; -import static muramasa.gregtech.data.Materials.Steam; +import static org.gtreimagined.gt5r.data.Materials.DistilledWater; +import static org.gtreimagined.gt5r.data.Materials.Steam; public class BlockEntityFusionReactor extends BlockEntityMultiMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityImplosionCompressor.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityImplosionCompressor.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityImplosionCompressor.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityImplosionCompressor.java index 3ff0434dd..d046743ae 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityImplosionCompressor.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityImplosionCompressor.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeAutoclave.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeAutoclave.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeAutoclave.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeAutoclave.java index 3e316b48d..e16a1b296 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeAutoclave.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeAutoclave.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; @@ -10,8 +11,7 @@ import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.block.BlockCoil; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; +import org.gtreimagined.gt5r.block.BlockCoil; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBath.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeBath.java similarity index 81% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBath.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeBath.java index d9b79c791..21d21589b 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBath.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeBath.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBoiler.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeBoiler.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBoiler.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeBoiler.java index cb8c6d94c..ce450918e 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeBoiler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeBoiler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; import muramasa.antimatter.block.BlockBasic; @@ -13,10 +13,10 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.registration.ITextureProvider; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.block.BlockCasing; -import muramasa.gregtech.data.GT5RBlocks; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.data.GT5RBlocks; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -27,8 +27,8 @@ import org.gtreimagined.gtcore.item.ItemSelectorTag; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.Materials.DistilledWater; -import static muramasa.gregtech.data.Materials.Steam; +import static org.gtreimagined.gt5r.data.Materials.DistilledWater; +import static org.gtreimagined.gt5r.data.Materials.Steam; public class BlockEntityLargeBoiler extends BlockEntityMultiMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeCentrifuge.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeCentrifuge.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeCentrifuge.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeCentrifuge.java index bf6ba36e0..c2ebfdbf9 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeCentrifuge.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeCentrifuge.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; @@ -10,7 +11,6 @@ import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeChemicalReactor.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeChemicalReactor.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeChemicalReactor.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeChemicalReactor.java index 3c8120315..42073e8d1 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeChemicalReactor.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeChemicalReactor.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; @@ -10,8 +11,7 @@ import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.block.BlockCoil; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; +import org.gtreimagined.gt5r.block.BlockCoil; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeElectrolyzer.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeElectrolyzer.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeElectrolyzer.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeElectrolyzer.java index 31f60be1c..dc69cbcdf 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeElectrolyzer.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeElectrolyzer.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; @@ -10,8 +11,7 @@ import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.block.BlockCoil; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; +import org.gtreimagined.gt5r.block.BlockCoil; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeHeatExchanger.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeHeatExchanger.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeHeatExchanger.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeHeatExchanger.java index c58fa8c66..bbd3237b2 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeHeatExchanger.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeHeatExchanger.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.capability.IFilterableHandler; import muramasa.antimatter.capability.fluid.FluidTank; @@ -20,7 +21,6 @@ import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -31,7 +31,7 @@ import tesseract.TesseractGraphWrappers; import tesseract.api.heat.IHeatHandler; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; public class BlockEntityLargeHeatExchanger extends BlockEntityMultiMachine implements IFilterableHandler { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeMacerator.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeMacerator.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeMacerator.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeMacerator.java index 96e9d90b7..c2eaa36a9 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeMacerator.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeMacerator.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; @@ -10,7 +11,6 @@ import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeOreWasher.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeOreWasher.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeOreWasher.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeOreWasher.java index ddba0d6c5..94472c893 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeOreWasher.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeOreWasher.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; @@ -11,7 +12,6 @@ import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeTank.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeTank.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeTank.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeTank.java index 68dd4c4fa..f06fc413b 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeTank.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeTank.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; @@ -10,8 +10,8 @@ import muramasa.antimatter.data.AntimatterTags; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.machine.MultiblockTankMachine; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.machine.MultiblockTankMachine; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeTurbine.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeTurbine.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeTurbine.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeTurbine.java index 2c655385e..ff5749a08 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLargeTurbine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeTurbine.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; import earth.terrarium.botarium.common.fluid.base.FluidHolder; @@ -17,8 +17,8 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.registration.ITextureProvider; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.items.ItemTurbineRotor; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.items.ItemTurbineRotor; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.item.ItemStack; @@ -29,8 +29,8 @@ import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT; import static muramasa.antimatter.machine.Tier.EV; import static muramasa.antimatter.machine.Tier.HV; -import static muramasa.gregtech.data.Materials.DistilledWater; -import static muramasa.gregtech.data.Materials.Steam; +import static org.gtreimagined.gt5r.data.Materials.DistilledWater; +import static org.gtreimagined.gt5r.data.Materials.Steam; public class BlockEntityLargeTurbine extends BlockEntityMultiMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java index 28f1ba8c4..f26e2d26e 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLongDistancePipeEndpoint.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; @@ -15,10 +15,10 @@ import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.structure.StructureCache; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.block.BlockCasing; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.Machines; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.Machines; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityMultiSmelter.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityMultiSmelter.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityMultiSmelter.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityMultiSmelter.java index 288d5f6e7..1b01b27ad 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityMultiSmelter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityMultiSmelter.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; @@ -10,8 +11,7 @@ import muramasa.antimatter.integration.jeirei.renderer.IInfoRenderer; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.block.BlockCoil; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; +import org.gtreimagined.gt5r.block.BlockCoil; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityOilCrackingUnit.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityOilCrackingUnit.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityOilCrackingUnit.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityOilCrackingUnit.java index 6a2b72ab3..7ae5d14c7 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityOilCrackingUnit.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityOilCrackingUnit.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityOilDrillingRig.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityOilDrillingRig.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityOilDrillingRig.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityOilDrillingRig.java index f1a9a0a24..abe016c2e 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityOilDrillingRig.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityOilDrillingRig.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; import earth.terrarium.botarium.common.fluid.base.FluidHolder; @@ -20,10 +20,10 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.util.Utils; import muramasa.antimatter.util.int3; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.gui.ButtonOverlays; -import muramasa.gregtech.worldgen.OilSpoutEntry; -import muramasa.gregtech.worldgen.OilSpoutSavedData; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.gui.ButtonOverlays; +import org.gtreimagined.gt5r.worldgen.OilSpoutEntry; +import org.gtreimagined.gt5r.worldgen.OilSpoutSavedData; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; @@ -47,8 +47,8 @@ import java.util.List; import static muramasa.antimatter.gui.ICanSyncData.SyncDirection.SERVER_TO_CLIENT; -import static muramasa.gregtech.data.GT5RBlocks.MINING_PIPE; -import static muramasa.gregtech.data.GT5RBlocks.MINING_PIPE_THIN; +import static org.gtreimagined.gt5r.data.GT5RBlocks.MINING_PIPE; +import static org.gtreimagined.gt5r.data.GT5RBlocks.MINING_PIPE_THIN; public class BlockEntityOilDrillingRig extends BlockEntityMultiMachine implements IFilterableHandler, IMiningPipeTile { boolean foundBottom = false; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityPrimitiveBlastFurnace.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityPrimitiveBlastFurnace.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityPrimitiveBlastFurnace.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityPrimitiveBlastFurnace.java index e20c24020..a67b50627 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityPrimitiveBlastFurnace.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityPrimitiveBlastFurnace.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine; import muramasa.antimatter.capability.machine.CookingRecipeHandler; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.util.int3; -import muramasa.gregtech.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RBlocks; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityProcessingArray.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityProcessingArray.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityProcessingArray.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityProcessingArray.java index 14a00a292..74d95f692 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityProcessingArray.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityProcessingArray.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; @@ -24,7 +25,6 @@ import muramasa.antimatter.recipe.map.IRecipeMap; import muramasa.antimatter.recipe.map.RecipeMap; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; import net.minecraft.client.gui.Font; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityPyrolysisOven.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityPyrolysisOven.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityPyrolysisOven.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityPyrolysisOven.java index 4af10446c..a7e32df21 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityPyrolysisOven.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityPyrolysisOven.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.capability.machine.MachineRecipeHandler; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.block.BlockCoil; +import org.gtreimagined.gt5r.block.BlockCoil; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityTreeGrowthSimulator.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityTreeGrowthSimulator.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityTreeGrowthSimulator.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityTreeGrowthSimulator.java index 60c04589b..0917ff0c3 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityTreeGrowthSimulator.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityTreeGrowthSimulator.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.capability.machine.MachineRecipeHandler; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.registration.ITextureProvider; -import muramasa.gregtech.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RBlocks; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityVacuumFreezer.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityVacuumFreezer.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityVacuumFreezer.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityVacuumFreezer.java index ee6700756..395786168 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/BlockEntityVacuumFreezer.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityVacuumFreezer.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/IMiningPipeTile.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/IMiningPipeTile.java similarity index 72% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/IMiningPipeTile.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/IMiningPipeTile.java index cac549a95..67a10e864 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/IMiningPipeTile.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/IMiningPipeTile.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/multi/MiningPipeStructureCache.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/MiningPipeStructureCache.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/blockentity/multi/MiningPipeStructureCache.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/MiningPipeStructureCache.java index 5ba865355..001cfc8ee 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/multi/MiningPipeStructureCache.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/multi/MiningPipeStructureCache.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.multi; +package org.gtreimagined.gt5r.blockentity.multi; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityAssembler.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityAssembler.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityAssembler.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityAssembler.java index a6a9467cb..338144b8c 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityAssembler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityAssembler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -10,8 +10,8 @@ import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.recipe.serializer.AntimatterRecipeSerializer; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -21,7 +21,7 @@ import tesseract.TesseractGraphWrappers; import tesseract.api.item.ExtendedItemContainer; -import static muramasa.gregtech.data.Materials.Glue; +import static org.gtreimagined.gt5r.data.Materials.Glue; public class BlockEntityAssembler extends BlockEntityMachine { public BlockEntityAssembler(Machine type, BlockPos pos, BlockState state) { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBath.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBath.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBath.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBath.java index 4e97a51f1..993c6f535 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBath.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBath.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -13,8 +13,8 @@ import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -26,7 +26,7 @@ import tesseract.api.item.ExtendedItemContainer; import static muramasa.antimatter.Ref.L; -import static muramasa.gregtech.data.Materials.Chlorine; +import static org.gtreimagined.gt5r.data.Materials.Chlorine; public class BlockEntityBath extends BlockEntityMachine { public BlockEntityBath(Machine type, BlockPos pos, BlockState state) { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBridge.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBridge.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBridge.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBridge.java index edee52111..a9c8cb792 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBridge.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBridge.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.blockentity.IExtendingBlockEntity; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBuffer.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBuffer.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBuffer.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBuffer.java index 8e765b017..8b74d1c13 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityBuffer.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityBuffer.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityCache; import muramasa.antimatter.capability.machine.MachineEnergyHandler; @@ -10,7 +10,7 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.gui.ButtonOverlays; +import org.gtreimagined.gt5r.gui.ButtonOverlays; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityCoalBoiler.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityCoalBoiler.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityCoalBoiler.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityCoalBoiler.java index c41c450a2..83942167b 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityCoalBoiler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityCoalBoiler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; @@ -25,7 +25,7 @@ import static muramasa.antimatter.machine.MachineState.ACTIVE; import static muramasa.antimatter.machine.MachineState.IDLE; import static muramasa.antimatter.machine.Tier.BRONZE; -import static muramasa.gregtech.data.Materials.DistilledWater; +import static org.gtreimagined.gt5r.data.Materials.DistilledWater; public class BlockEntityCoalBoiler extends BlockEntityMachine { int maxHeat = 500, heat, fuel = 0, maxFuel, lossTimer = 0; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityCropHarvester.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityCropHarvester.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityCropHarvester.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityCropHarvester.java index cc92996f1..aacf4b844 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityCropHarvester.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityCropHarvester.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityHull.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityHull.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityHull.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityHull.java index 73a79a850..4bc5a0bff 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityHull.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityHull.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.blockentity.BlockEntityMachine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityIUpgradedBatchMachine.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityIUpgradedBatchMachine.java similarity index 89% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityIUpgradedBatchMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityIUpgradedBatchMachine.java index c12e69ea1..7e9533a78 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityIUpgradedBatchMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityIUpgradedBatchMachine.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; +import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.machine.caps.ParallelRecipeHandler; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInfiniteFluid.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInfiniteFluid.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInfiniteFluid.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInfiniteFluid.java index 66521201e..1d93e719e 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInfiniteFluid.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInfiniteFluid.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; @@ -10,7 +10,7 @@ import muramasa.antimatter.cover.ICover; import muramasa.antimatter.gui.SlotType; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.data.GT5RTags; +import org.gtreimagined.gt5r.data.GT5RTags; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; @@ -19,7 +19,7 @@ import java.util.List; -import static muramasa.gregtech.data.Materials.Steam; +import static org.gtreimagined.gt5r.data.Materials.Steam; public class BlockEntityInfiniteFluid extends BlockEntityMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInputBus.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInputBus.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInputBus.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInputBus.java index ee5ae0bf1..5f4cfa7bf 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInputBus.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInputBus.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.multi.BlockEntityHatch; import muramasa.antimatter.capability.item.TrackedItemHandler; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInputHatch.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInputHatch.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInputHatch.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInputHatch.java index a66b312d9..956c75689 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityInputHatch.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityInputHatch.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.multi.BlockEntityHatch; import muramasa.antimatter.capability.machine.MachineCoverHandler; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityItemFilter.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityItemFilter.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityItemFilter.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityItemFilter.java index 7dae8527d..e444ae4f9 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityItemFilter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityItemFilter.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import muramasa.antimatter.Ref; @@ -15,8 +15,8 @@ import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.gui.ButtonOverlays; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.gui.ButtonOverlays; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityLavaBoiler.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityLavaBoiler.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityLavaBoiler.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityLavaBoiler.java index 7e30c1b2d..f43228987 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityLavaBoiler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityLavaBoiler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; @@ -24,7 +24,7 @@ import static muramasa.antimatter.machine.MachineState.ACTIVE; import static muramasa.antimatter.machine.MachineState.IDLE; -import static muramasa.gregtech.data.Materials.DistilledWater; +import static org.gtreimagined.gt5r.data.Materials.DistilledWater; public class BlockEntityLavaBoiler extends BlockEntityMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityLimitedOutput.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityLimitedOutput.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityLimitedOutput.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityLimitedOutput.java index 16940a3a5..e7eba0c2a 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityLimitedOutput.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityLimitedOutput.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.item.TrackedItemHandler; @@ -8,7 +8,7 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.data.Machines; +import org.gtreimagined.gt5r.data.Machines; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityMacerator.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityMacerator.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityMacerator.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityMacerator.java index 886409c40..37079ca09 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityMacerator.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityMacerator.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.machine.MachineRecipeHandler; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.map.IRecipeMap; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityNuclearReactorCore.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityNuclearReactorCore.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityNuclearReactorCore.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityNuclearReactorCore.java index 0d0f0783d..feb93bda3 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityNuclearReactorCore.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityNuclearReactorCore.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.Ref; @@ -20,9 +20,9 @@ import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.util.CodeUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.ToolTypes; -import muramasa.gregtech.items.IItemReactorRod; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.ToolTypes; +import org.gtreimagined.gt5r.items.IItemReactorRod; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -52,7 +52,7 @@ import java.util.function.Function; import static muramasa.antimatter.Ref.B; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; import static net.minecraft.core.Direction.*; public class BlockEntityNuclearReactorCore extends BlockEntitySecondaryOutput implements IFilterableHandler, IPostTickTile, IInventorySyncTile { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityPrinter.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityPrinter.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityPrinter.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityPrinter.java index 4906f58f3..31d2b72fe 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityPrinter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityPrinter.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -17,8 +17,8 @@ import muramasa.antimatter.recipe.serializer.AntimatterRecipeSerializer; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -32,7 +32,7 @@ import tesseract.api.item.ExtendedItemContainer; import static muramasa.antimatter.Ref.L; -import static muramasa.gregtech.data.Materials.SquidInk; +import static org.gtreimagined.gt5r.data.Materials.SquidInk; public class BlockEntityPrinter extends BlockEntityMachine implements IFilterableHandler { public BlockEntityPrinter(Machine type, BlockPos pos, BlockState state) { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityPump.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityPump.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityPump.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityPump.java index d3ddf7a38..de4e1d289 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityPump.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityPump.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityRockBreaker.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityRockBreaker.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityRockBreaker.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityRockBreaker.java index 0561de07f..a247ebedc 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityRockBreaker.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityRockBreaker.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.machine.MachineRecipeHandler; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityScanner.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityScanner.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityScanner.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityScanner.java index 9c1e89b39..ae4cfe3df 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityScanner.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityScanner.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -11,8 +11,8 @@ import muramasa.antimatter.recipe.IRecipe; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.recipe.serializer.AntimatterRecipeSerializer; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySecondaryOutput.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySecondaryOutput.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySecondaryOutput.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySecondaryOutput.java index e30ff7f01..3dbb959bc 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySecondaryOutput.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySecondaryOutput.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; +import org.gtreimagined.gt5r.machine.caps.SecondaryOutputCoverHandler; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.machine.caps.SecondaryOutputCoverHandler; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySeismicProspector.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySeismicProspector.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySeismicProspector.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySeismicProspector.java index e0d5c84e8..9333ea387 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySeismicProspector.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySeismicProspector.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import it.unimi.dsi.fastutil.longs.LongList; import muramasa.antimatter.blockentity.BlockEntityMachine; @@ -7,9 +7,9 @@ import muramasa.antimatter.material.Material; import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.worldgen.vein.VeinSavedData; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.worldgen.OilSpoutEntry; -import muramasa.gregtech.worldgen.OilSpoutSavedData; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.worldgen.OilSpoutEntry; +import org.gtreimagined.gt5r.worldgen.OilSpoutSavedData; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySmallHeatExchanger.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySmallHeatExchanger.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySmallHeatExchanger.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySmallHeatExchanger.java index e10039efd..16e126506 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySmallHeatExchanger.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySmallHeatExchanger.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.capability.fluid.FluidTank; @@ -16,8 +16,8 @@ import tesseract.TesseractGraphWrappers; import static muramasa.antimatter.data.AntimatterMaterials.Water; -import static muramasa.gregtech.data.Materials.DistilledWater; -import static muramasa.gregtech.data.Materials.Steam; +import static org.gtreimagined.gt5r.data.Materials.DistilledWater; +import static org.gtreimagined.gt5r.data.Materials.Steam; public class BlockEntitySmallHeatExchanger extends BlockEntitySecondaryOutput { boolean hadNoWater = false; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySolarBoiler.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySolarBoiler.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySolarBoiler.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySolarBoiler.java index 4c56a8f28..39b313835 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySolarBoiler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySolarBoiler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; @@ -20,7 +20,7 @@ import static muramasa.antimatter.machine.MachineState.ACTIVE; import static muramasa.antimatter.machine.MachineState.IDLE; -import static muramasa.gregtech.data.Materials.DistilledWater; +import static org.gtreimagined.gt5r.data.Materials.DistilledWater; public class BlockEntitySolarBoiler extends BlockEntityMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySolarPanel.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySolarPanel.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySolarPanel.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySolarPanel.java index a98bd19e3..d67336e04 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySolarPanel.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySolarPanel.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.machine.MachineEnergyHandler; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySteamMachine.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySteamMachine.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySteamMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySteamMachine.java index 12e58c966..6133a88ea 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySteamMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySteamMachine.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.blockentity.BlockEntityMachine; @@ -9,13 +9,13 @@ import muramasa.antimatter.machine.event.IMachineEvent; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.recipe.IRecipe; -import muramasa.gregtech.data.GT5RTags; +import org.gtreimagined.gt5r.data.GT5RTags; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; import tesseract.TesseractGraphWrappers; import static muramasa.antimatter.machine.Tier.BRONZE; -import static muramasa.gregtech.data.Machines.STEAM_FORGE_HAMMER; +import static org.gtreimagined.gt5r.data.Machines.STEAM_FORGE_HAMMER; public class BlockEntitySteamMachine extends BlockEntityMachine { diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySteamTurbine.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySteamTurbine.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySteamTurbine.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySteamTurbine.java index d86f838b1..22b519344 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntitySteamTurbine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySteamTurbine.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.machine.MachineRecipeHandler; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityTypeFilter.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityTypeFilter.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityTypeFilter.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityTypeFilter.java index 7b606d798..2e43d94cc 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityTypeFilter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntityTypeFilter.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import muramasa.antimatter.gui.SlotType; import muramasa.antimatter.machine.types.Machine; diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/ISteamBoilerHandler.java b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/ISteamBoilerHandler.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/blockentity/single/ISteamBoilerHandler.java rename to common/src/main/java/org/gtreimagined/gt5r/blockentity/single/ISteamBoilerHandler.java index e744ef02a..8fbbd14e1 100644 --- a/common/src/main/java/muramasa/gregtech/blockentity/single/ISteamBoilerHandler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/blockentity/single/ISteamBoilerHandler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.blockentity.single; +package org.gtreimagined.gt5r.blockentity.single; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.blockentity.BlockEntityMachine; @@ -12,7 +12,7 @@ import tesseract.FluidPlatformUtils; import tesseract.TesseractGraphWrappers; -import static muramasa.gregtech.data.Materials.Steam; +import static org.gtreimagined.gt5r.data.Materials.Steam; public interface ISteamBoilerHandler { int getProcessDelay(); diff --git a/common/src/main/java/muramasa/gregtech/client/GT5RModelManager.java b/common/src/main/java/org/gtreimagined/gt5r/client/GT5RModelManager.java similarity index 78% rename from common/src/main/java/muramasa/gregtech/client/GT5RModelManager.java rename to common/src/main/java/org/gtreimagined/gt5r/client/GT5RModelManager.java index f31186df5..b0fe6372d 100644 --- a/common/src/main/java/muramasa/gregtech/client/GT5RModelManager.java +++ b/common/src/main/java/org/gtreimagined/gt5r/client/GT5RModelManager.java @@ -1,6 +1,6 @@ -package muramasa.gregtech.client; +package org.gtreimagined.gt5r.client; -import muramasa.gregtech.GT5RRef; +import org.gtreimagined.gt5r.GT5RRef; import net.minecraft.resources.ResourceLocation; public class GT5RModelManager { diff --git a/common/src/main/java/muramasa/gregtech/client/ReactorBakedModel.java b/common/src/main/java/org/gtreimagined/gt5r/client/ReactorBakedModel.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/client/ReactorBakedModel.java rename to common/src/main/java/org/gtreimagined/gt5r/client/ReactorBakedModel.java index 1405d534a..38185fc44 100644 --- a/common/src/main/java/muramasa/gregtech/client/ReactorBakedModel.java +++ b/common/src/main/java/org/gtreimagined/gt5r/client/ReactorBakedModel.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.client; +package org.gtreimagined.gt5r.client; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import muramasa.antimatter.AntimatterProperties; import muramasa.antimatter.Ref; @@ -10,8 +11,7 @@ import muramasa.antimatter.cover.ICover; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; -import muramasa.gregtech.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RCovers; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.BakedModel; diff --git a/common/src/main/java/muramasa/gregtech/client/ReactorModel.java b/common/src/main/java/org/gtreimagined/gt5r/client/ReactorModel.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/client/ReactorModel.java rename to common/src/main/java/org/gtreimagined/gt5r/client/ReactorModel.java index 662c9f026..bdca96095 100644 --- a/common/src/main/java/muramasa/gregtech/client/ReactorModel.java +++ b/common/src/main/java/org/gtreimagined/gt5r/client/ReactorModel.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.client; +package org.gtreimagined.gt5r.client; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.util.Pair; diff --git a/common/src/main/java/muramasa/gregtech/client/ReactorModelLoader.java b/common/src/main/java/org/gtreimagined/gt5r/client/ReactorModelLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/client/ReactorModelLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/client/ReactorModelLoader.java index 9dc0e72b5..7e91a2a3c 100644 --- a/common/src/main/java/muramasa/gregtech/client/ReactorModelLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/client/ReactorModelLoader.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.client; +package org.gtreimagined.gt5r.client; import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.client.ModelUtils; import muramasa.antimatter.client.model.loader.AntimatterModelLoader; import muramasa.antimatter.machine.MachineState; -import muramasa.gregtech.GT5RRef; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite; import net.minecraft.client.resources.model.UnbakedModel; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverAdvancedFluidDetector.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAdvancedFluidDetector.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/cover/CoverAdvancedFluidDetector.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverAdvancedFluidDetector.java index cde669a60..1ff1d0e06 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverAdvancedFluidDetector.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAdvancedFluidDetector.java @@ -1,7 +1,8 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import earth.terrarium.botarium.common.fluid.base.FluidContainer; import earth.terrarium.botarium.common.fluid.base.FluidHolder; +import org.gtreimagined.gt5r.data.GT5RCovers; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.IFilterableHandler; @@ -14,7 +15,6 @@ import muramasa.antimatter.gui.event.IGuiEvent; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.machine.event.IMachineEvent; -import muramasa.gregtech.data.GT5RCovers; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverAirVent.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/cover/CoverAirVent.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java index 95a3df5ff..f25f2e104 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverAirVent.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java @@ -1,13 +1,14 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.Materials; import muramasa.antimatter.blockentity.pipe.BlockEntityFluidPipe; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; @@ -19,8 +20,6 @@ import java.util.Optional; -import static muramasa.gregtech.data.Materials.Air; - public class CoverAirVent extends BaseCover { public static String ID = "air_vent"; public CoverAirVent(@NotNull ICoverHandler source, @Nullable Tier tier, Direction side, CoverFactory factory) { @@ -49,7 +48,7 @@ public void onUpdate() { if (state.isAir() && cap.isPresent()){ if (level.getGameTime() % 360 == (30 + (60L * side.get3DDataValue()))){ if (level.dimension() == Level.OVERWORLD){ - cap.get().insertFluid(Air.getGas(64000), false); + cap.get().insertFluid(Materials.Air.getGas(64000), false); } } } diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverConveyor.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverConveyor.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/cover/CoverConveyor.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverConveyor.java index a9c1113e9..58a818477 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverConveyor.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverConveyor.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.cover.base.CoverBasicTransport; +import org.gtreimagined.gt5r.data.GT5RCovers; import muramasa.antimatter.blockentity.BlockEntityCache; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.IFilterableHandler; @@ -12,8 +14,6 @@ import muramasa.antimatter.machine.Tier; import muramasa.antimatter.machine.event.IMachineEvent; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.cover.base.CoverBasicTransport; -import muramasa.gregtech.data.GT5RCovers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverDrain.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverDrain.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/cover/CoverDrain.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverDrain.java index 7fb517cd2..ece2fdec5 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverDrain.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverDrain.java @@ -1,8 +1,9 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; 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 org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.blockentity.pipe.BlockEntityFluidPipe; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; @@ -10,7 +11,6 @@ import muramasa.antimatter.machine.Tier; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverDynamoColored.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverDynamoColored.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/cover/CoverDynamoColored.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverDynamoColored.java index 6aad33813..e74876865 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverDynamoColored.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverDynamoColored.java @@ -1,12 +1,12 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.data.TierMaps; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.client.RenderHelper; import muramasa.antimatter.cover.CoverDynamo; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.data.TierMaps; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverEnergyColored.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverEnergyColored.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/cover/CoverEnergyColored.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverEnergyColored.java index e37911104..c92b3b45d 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverEnergyColored.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverEnergyColored.java @@ -1,12 +1,12 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.data.TierMaps; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.client.RenderHelper; import muramasa.antimatter.cover.CoverEnergy; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.data.TierMaps; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverEnergyDetector.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverEnergyDetector.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/cover/CoverEnergyDetector.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverEnergyDetector.java index 2add77f66..846fd7d16 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverEnergyDetector.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverEnergyDetector.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverFluidDetector.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidDetector.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/cover/CoverFluidDetector.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidDetector.java index 47e45b668..df910810f 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverFluidDetector.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidDetector.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import earth.terrarium.botarium.common.fluid.base.FluidContainer; import earth.terrarium.botarium.common.fluid.base.FluidHolder; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.blockentity.pipe.BlockEntityFluidPipe; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverFluidFilter.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidFilter.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/cover/CoverFluidFilter.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidFilter.java index 17c629ce1..3bedc41f2 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverFluidFilter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidFilter.java @@ -1,7 +1,8 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; +import org.gtreimagined.gt5r.cover.base.CoverFilter; import muramasa.antimatter.blockentity.BlockEntityBase; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; @@ -10,7 +11,6 @@ import muramasa.antimatter.gui.event.GuiEvents; import muramasa.antimatter.gui.event.IGuiEvent; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverFilter; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverFluidRegulator.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidRegulator.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/cover/CoverFluidRegulator.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidRegulator.java index 559cd7592..05d89c22f 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverFluidRegulator.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverFluidRegulator.java @@ -1,7 +1,8 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import earth.terrarium.botarium.common.fluid.base.FluidContainer; import earth.terrarium.botarium.common.fluid.base.FluidHolder; +import org.gtreimagined.gt5r.cover.base.CoverBasicTransport; import muramasa.antimatter.blockentity.BlockEntityCache; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; @@ -13,7 +14,6 @@ import muramasa.antimatter.gui.widget.SyncableTextWidget; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.cover.base.CoverBasicTransport; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -25,8 +25,6 @@ import java.util.Objects; -import static muramasa.gregtech.cover.CoverPump.speeds; - public class CoverFluidRegulator extends CoverBasicTransport { public static String ID = "pump"; @@ -35,7 +33,7 @@ public class CoverFluidRegulator extends CoverBasicTransport { public CoverFluidRegulator(ICoverHandler source, @Nullable Tier tier, Direction side, CoverFactory factory) { super(source, tier, side, factory); Objects.requireNonNull(tier); - fluidLimit = speeds.get(tier); + fluidLimit = CoverPump.speeds.get(tier); addGuiCallback(t -> { t.addButton(52,53, ButtonOverlay.MINUS, true); t.addButton(106,53, ButtonOverlay.PLUS, true); @@ -97,7 +95,7 @@ public void onUpdate() { BlockPos finalTo = to; if (canMove(side)) { Direction finalFromSide = fromSide; - BlockEntityCache.getFluidHandlerCached(handler.getTile().getLevel(), from, fromSide).ifPresent(ih -> BlockEntityCache.getFluidHandlerCached(handler.getTile().getLevel(), finalTo, finalFromSide.getOpposite()).ifPresent(other -> Utils.transferFluids(ih, other, fluidLimit > 0 ? fluidLimit : speeds.get(tier)))); + BlockEntityCache.getFluidHandlerCached(handler.getTile().getLevel(), from, fromSide).ifPresent(ih -> BlockEntityCache.getFluidHandlerCached(handler.getTile().getLevel(), finalTo, finalFromSide.getOpposite()).ifPresent(other -> Utils.transferFluids(ih, other, fluidLimit > 0 ? fluidLimit : CoverPump.speeds.get(tier)))); } } protected boolean canMove(Direction side){ @@ -142,9 +140,9 @@ public void onGuiEvent(IGuiEvent event, Player playerEntity) { } } if (button == 3){ - if (fluidLimit < speeds.get(tier)){ + if (fluidLimit < CoverPump.speeds.get(tier)){ fluidLimit+= shiftHold ? 16 : 1; - if (fluidLimit > speeds.get(tier)) fluidLimit = speeds.get(tier); + if (fluidLimit > CoverPump.speeds.get(tier)) fluidLimit = CoverPump.speeds.get(tier); handler.getTile().setChanged(); } } diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverItemDetector.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemDetector.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/cover/CoverItemDetector.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemDetector.java index 75a3bd090..6eec961e5 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverItemDetector.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemDetector.java @@ -1,5 +1,6 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.data.GT5RCovers; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.blockentity.pipe.BlockEntityPipe; import muramasa.antimatter.capability.ICoverHandler; @@ -13,7 +14,6 @@ import muramasa.antimatter.gui.event.IGuiEvent; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.machine.event.IMachineEvent; -import muramasa.gregtech.data.GT5RCovers; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverItemFilter.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemFilter.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/cover/CoverItemFilter.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemFilter.java index f68d29cfc..227d169f3 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverItemFilter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemFilter.java @@ -1,5 +1,7 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.cover.base.CoverFilter; +import org.gtreimagined.gt5r.gui.ButtonOverlays; import muramasa.antimatter.blockentity.BlockEntityBase; import muramasa.antimatter.blockentity.pipe.BlockEntityItemPipe; import muramasa.antimatter.capability.ICoverHandler; @@ -9,8 +11,6 @@ import muramasa.antimatter.gui.event.GuiEvents; import muramasa.antimatter.gui.event.IGuiEvent; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverFilter; -import muramasa.gregtech.gui.ButtonOverlays; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverItemRegulator.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemRegulator.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/cover/CoverItemRegulator.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemRegulator.java index 3fecd03e1..c5ddd807f 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverItemRegulator.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemRegulator.java @@ -1,5 +1,6 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.cover.base.CoverBasicTransport; import muramasa.antimatter.blockentity.BlockEntityCache; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; @@ -11,7 +12,6 @@ import muramasa.antimatter.gui.widget.SyncableTextWidget; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.cover.base.CoverBasicTransport; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; @@ -28,7 +28,7 @@ import java.util.function.Predicate; -import static muramasa.gregtech.cover.CoverConveyor.speeds; +import static org.gtreimagined.gt5r.cover.CoverConveyor.speeds; public class CoverItemRegulator extends CoverBasicTransport { int slotLimit = 0; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverItemRetriever.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemRetriever.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/cover/CoverItemRetriever.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemRetriever.java index 025fd65d5..ce9551987 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverItemRetriever.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverItemRetriever.java @@ -1,5 +1,6 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.gui.ButtonOverlays; import muramasa.antimatter.blockentity.BlockEntityBase; import muramasa.antimatter.blockentity.pipe.BlockEntityItemPipe; import muramasa.antimatter.blockentity.pipe.BlockEntityPipe; @@ -15,7 +16,6 @@ import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.CodeUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.gui.ButtonOverlays; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverPump.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverPump.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/cover/CoverPump.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverPump.java index 24d0e7197..369300273 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverPump.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverPump.java @@ -1,8 +1,9 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import com.google.common.collect.ImmutableMap; import earth.terrarium.botarium.common.fluid.base.FluidContainer; import earth.terrarium.botarium.common.fluid.base.FluidHolder; +import org.gtreimagined.gt5r.cover.base.CoverBasicTransport; import muramasa.antimatter.blockentity.BlockEntityCache; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.IFilterableHandler; @@ -12,8 +13,7 @@ import muramasa.antimatter.machine.Tier; import muramasa.antimatter.machine.event.IMachineEvent; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.cover.base.CoverBasicTransport; -import muramasa.gregtech.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RCovers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverReactorOutput.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverReactorOutput.java similarity index 86% rename from common/src/main/java/muramasa/gregtech/cover/CoverReactorOutput.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverReactorOutput.java index c7ac88f91..a653abf3d 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverReactorOutput.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverReactorOutput.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.cover.CoverOutput; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverReactorOutputSecondary.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverReactorOutputSecondary.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/cover/CoverReactorOutputSecondary.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverReactorOutputSecondary.java index d7fa1daa3..2b089ecce 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverReactorOutputSecondary.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverReactorOutputSecondary.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import earth.terrarium.botarium.common.fluid.base.FluidHolder; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import muramasa.antimatter.blockentity.BlockEntityCache; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.machine.MachineFluidHandler; @@ -8,8 +10,6 @@ import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverRobotArm.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverRobotArm.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/cover/CoverRobotArm.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverRobotArm.java index 1bdd4bd61..a1841cbce 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverRobotArm.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverRobotArm.java @@ -1,5 +1,7 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstone; +import org.gtreimagined.gt5r.cover.base.CoverBasicTransport; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.machine.MachineItemHandler; @@ -11,8 +13,6 @@ import muramasa.antimatter.gui.widget.SyncableTextWidget; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.cover.base.CoverBasicRedstone; -import muramasa.gregtech.cover.base.CoverBasicTransport; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverSecondaryOutput.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverSecondaryOutput.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/cover/CoverSecondaryOutput.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverSecondaryOutput.java index cfe28ccac..83bdb064e 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverSecondaryOutput.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverSecondaryOutput.java @@ -1,7 +1,9 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; +import org.gtreimagined.gt5r.blockentity.single.BlockEntitySmallHeatExchanger; +import org.gtreimagined.gt5r.data.Materials; import muramasa.antimatter.blockentity.BlockEntityCache; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.fluid.FluidTank; @@ -9,15 +11,12 @@ import muramasa.antimatter.cover.BaseCover; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.blockentity.single.BlockEntitySmallHeatExchanger; import net.minecraft.core.Direction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import tesseract.FluidPlatformUtils; import tesseract.TesseractGraphWrappers; -import static muramasa.gregtech.data.Materials.Steam; - public class CoverSecondaryOutput extends BaseCover { public CoverSecondaryOutput(@NotNull ICoverHandler source, @Nullable Tier tier, Direction side, CoverFactory factory) { super(source, tier, side, factory); @@ -33,7 +32,7 @@ public void onUpdate() { if (handler.getTile() instanceof BlockEntitySmallHeatExchanger heatExchanger){ if (heatExchanger.fluidHandler.isPresent()){ MachineFluidHandler fluidHandler = heatExchanger.fluidHandler.get(); - int outputfluid = fluidHandler.getOutputTanks().getFirstAvailableTank(Steam.getGas(1), true); + int outputfluid = fluidHandler.getOutputTanks().getFirstAvailableTank(Materials.Steam.getGas(1), true); if (outputfluid >= 0){ FluidTank outputTank = fluidHandler.getOutputTanks().getTank(outputfluid); BlockEntityCache.getFluidHandlerCached(heatExchanger.getLevel(), heatExchanger.getBlockPos().relative(this.side), this.side.getOpposite()).ifPresent(f -> { diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverShutter.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverShutter.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/cover/CoverShutter.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverShutter.java index 8496850b8..5c664a600 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverShutter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverShutter.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import muramasa.antimatter.blockentity.pipe.BlockEntityPipe; import muramasa.antimatter.capability.ICoverHandler; diff --git a/common/src/main/java/muramasa/gregtech/cover/CoverSteamVent.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverSteamVent.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/cover/CoverSteamVent.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/CoverSteamVent.java index ad0d44e12..0cc0e1ec9 100644 --- a/common/src/main/java/muramasa/gregtech/cover/CoverSteamVent.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverSteamVent.java @@ -1,12 +1,12 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.blockentity.single.BlockEntitySteamMachine; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.blockentity.single.BlockEntitySteamMachine; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/common/src/main/java/muramasa/gregtech/cover/ICoverRedstoneSensitive.java b/common/src/main/java/org/gtreimagined/gt5r/cover/ICoverRedstoneSensitive.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/cover/ICoverRedstoneSensitive.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/ICoverRedstoneSensitive.java index ce13ceff2..f408b088d 100644 --- a/common/src/main/java/muramasa/gregtech/cover/ICoverRedstoneSensitive.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/ICoverRedstoneSensitive.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; +import org.gtreimagined.gt5r.cover.redstone.CoverRedstoneMachineController; import muramasa.antimatter.capability.ICoverHandlerProvider; import muramasa.antimatter.cover.ICover; -import muramasa.gregtech.cover.redstone.CoverRedstoneMachineController; import net.minecraft.core.Direction; import java.util.ArrayList; diff --git a/common/src/main/java/muramasa/gregtech/cover/ImportExportMode.java b/common/src/main/java/org/gtreimagined/gt5r/cover/ImportExportMode.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/cover/ImportExportMode.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/ImportExportMode.java index 20e185bc5..afdf2f9b0 100644 --- a/common/src/main/java/muramasa/gregtech/cover/ImportExportMode.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/ImportExportMode.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; public enum ImportExportMode { EXPORT(true), diff --git a/common/src/main/java/muramasa/gregtech/cover/RedstoneMode.java b/common/src/main/java/org/gtreimagined/gt5r/cover/RedstoneMode.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/cover/RedstoneMode.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/RedstoneMode.java index 079d495f9..179486117 100644 --- a/common/src/main/java/muramasa/gregtech/cover/RedstoneMode.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/RedstoneMode.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover; +package org.gtreimagined.gt5r.cover; import muramasa.antimatter.cover.ICoverMode; diff --git a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstone.java b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstone.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstone.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstone.java index 540d4a19f..fb7f66392 100644 --- a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstone.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstone.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover.base; +package org.gtreimagined.gt5r.cover.base; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; @@ -6,7 +6,7 @@ import muramasa.antimatter.gui.event.GuiEvents; import muramasa.antimatter.gui.event.IGuiEvent; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.RedstoneMode; +import org.gtreimagined.gt5r.cover.RedstoneMode; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.player.Player; diff --git a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstoneInput.java b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstoneInput.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstoneInput.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstoneInput.java index ad364b800..6db557aa0 100644 --- a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstoneInput.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstoneInput.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover.base; +package org.gtreimagined.gt5r.cover.base; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; diff --git a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstoneOutput.java b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstoneOutput.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstoneOutput.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstoneOutput.java index 5b68d5a35..7ce9f0206 100644 --- a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicRedstoneOutput.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicRedstoneOutput.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover.base; +package org.gtreimagined.gt5r.cover.base; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; diff --git a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicTransport.java b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicTransport.java similarity index 89% rename from common/src/main/java/muramasa/gregtech/cover/base/CoverBasicTransport.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicTransport.java index f99edb290..5973665b7 100644 --- a/common/src/main/java/muramasa/gregtech/cover/base/CoverBasicTransport.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverBasicTransport.java @@ -1,5 +1,6 @@ -package muramasa.gregtech.cover.base; +package org.gtreimagined.gt5r.cover.base; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.blockentity.pipe.BlockEntityPipe; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; @@ -7,18 +8,14 @@ import muramasa.antimatter.gui.event.GuiEvents; import muramasa.antimatter.gui.event.IGuiEvent; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.cover.ICoverRedstoneSensitive; -import muramasa.gregtech.cover.ImportExportMode; -import muramasa.gregtech.cover.RedstoneMode; +import org.gtreimagined.gt5r.cover.ICoverRedstoneSensitive; +import org.gtreimagined.gt5r.cover.ImportExportMode; +import org.gtreimagined.gt5r.cover.RedstoneMode; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.player.Player; import org.jetbrains.annotations.Nullable; -import static muramasa.gregtech.cover.ImportExportMode.EXPORT; -import static muramasa.gregtech.cover.ImportExportMode.IMPORT; - public abstract class CoverBasicTransport extends CoverBasicRedstone implements ICoverRedstoneSensitive { protected ImportExportMode exportMode; @@ -26,7 +23,7 @@ public abstract class CoverBasicTransport extends CoverBasicRedstone implements public CoverBasicTransport(ICoverHandler source, @Nullable Tier tier, Direction side, CoverFactory factory) { super(source, tier, side, factory); - this.exportMode = source.getTile() instanceof BlockEntityPipe ? IMPORT : EXPORT; + this.exportMode = source.getTile() instanceof BlockEntityPipe ? ImportExportMode.IMPORT : ImportExportMode.EXPORT; redstoneMode = RedstoneMode.NO_WORK; coverModeInt = exportMode.ordinal(); addButtons(); diff --git a/common/src/main/java/muramasa/gregtech/cover/base/CoverFilter.java b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverFilter.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/cover/base/CoverFilter.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverFilter.java index 10f16c42f..1ec198d62 100644 --- a/common/src/main/java/muramasa/gregtech/cover/base/CoverFilter.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/base/CoverFilter.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover.base; +package org.gtreimagined.gt5r.cover.base; import muramasa.antimatter.capability.CoverHandler; import muramasa.antimatter.capability.ICoverHandler; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorPossible.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorPossible.java similarity index 82% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorPossible.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorPossible.java index 48a0afe7d..c28fd2441 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorPossible.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorPossible.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; import net.minecraft.core.Direction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorProcessing.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorProcessing.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorProcessing.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorProcessing.java index 91a52e93b..0c745abd4 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorProcessing.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorProcessing.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; @@ -6,7 +6,7 @@ import muramasa.antimatter.machine.MachineFlag; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; import net.minecraft.core.Direction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorSuccessful.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorSuccessful.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorSuccessful.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorSuccessful.java index 9d686832d..a6af805b5 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverActivityDetectorSuccessful.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverActivityDetectorSuccessful.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.IGuiHandler; @@ -7,7 +7,7 @@ import muramasa.antimatter.machine.event.IMachineEvent; import muramasa.antimatter.machine.event.MachineEvent; import muramasa.antimatter.tool.AntimatterToolType; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverNeedsMaintenance.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverNeedsMaintenance.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverNeedsMaintenance.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverNeedsMaintenance.java index f456c18e8..f3aeacefe 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverNeedsMaintenance.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverNeedsMaintenance.java @@ -1,5 +1,6 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; +import org.gtreimagined.gt5r.blockentity.multi.BlockEntityLargeTurbine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.data.AntimatterDefaultTools; @@ -7,9 +8,8 @@ import muramasa.antimatter.machine.Tier; import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.blockentity.multi.BlockEntityLargeTurbine; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; -import muramasa.gregtech.items.ItemTurbineRotor; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; +import org.gtreimagined.gt5r.items.ItemTurbineRotor; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverProgressSensor.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverProgressSensor.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverProgressSensor.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverProgressSensor.java index ed36e5fad..41687660f 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverProgressSensor.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverProgressSensor.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.capability.machine.MachineRecipeHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneConductorAccept.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneConductorAccept.java similarity index 89% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneConductorAccept.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneConductorAccept.java index a8e920477..bdba8aa11 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneConductorAccept.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneConductorAccept.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.tool.AntimatterToolType; -import muramasa.gregtech.cover.base.CoverBasicRedstoneInput; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneInput; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneConductorEmit.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneConductorEmit.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneConductorEmit.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneConductorEmit.java index 136b1fcfb..0187e6583 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneConductorEmit.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneConductorEmit.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.cover.ICover; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.tool.AntimatterToolType; -import muramasa.gregtech.cover.base.CoverBasicRedstoneOutput; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneOutput; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.InteractionHand; diff --git a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneMachineController.java b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneMachineController.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneMachineController.java rename to common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneMachineController.java index c613b9e70..cb3153e24 100644 --- a/common/src/main/java/muramasa/gregtech/cover/redstone/CoverRedstoneMachineController.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/redstone/CoverRedstoneMachineController.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.cover.redstone; +package org.gtreimagined.gt5r.cover.redstone; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.cover.base.CoverBasicRedstoneInput; +import org.gtreimagined.gt5r.cover.base.CoverBasicRedstoneInput; import net.minecraft.core.Direction; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/muramasa/gregtech/data/ClientData.java b/common/src/main/java/org/gtreimagined/gt5r/data/ClientData.java similarity index 82% rename from common/src/main/java/muramasa/gregtech/data/ClientData.java rename to common/src/main/java/org/gtreimagined/gt5r/data/ClientData.java index f14c886b5..b37af1644 100644 --- a/common/src/main/java/muramasa/gregtech/data/ClientData.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/ClientData.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.gui.container.ContainerBasicMachine; import muramasa.antimatter.gui.container.ContainerMachine; import muramasa.antimatter.gui.container.ContainerMultiMachine; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.gui.ScreenCoalBoiler; -import muramasa.gregtech.gui.ScreenFusionReactor; -import muramasa.gregtech.gui.ScreenSteamMachine; +import org.gtreimagined.gt5r.gui.ScreenCoalBoiler; +import org.gtreimagined.gt5r.gui.ScreenFusionReactor; +import org.gtreimagined.gt5r.gui.ScreenSteamMachine; import net.minecraft.client.gui.screens.MenuScreens; public class ClientData { diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RBlocks.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RBlocks.java similarity index 75% rename from common/src/main/java/muramasa/gregtech/data/GT5RBlocks.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RBlocks.java index 572237b09..65d3bbd6d 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RBlocks.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RBlocks.java @@ -1,5 +1,7 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; +import gtreimagined.gt5r.block.*; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.data.AntimatterMaterials; @@ -10,8 +12,7 @@ import muramasa.antimatter.pipe.types.ItemPipe; import muramasa.antimatter.pipe.types.Wire; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.block.*; +import muramasa.gt5r.block.*; import net.minecraft.core.BlockPos; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; @@ -24,8 +25,8 @@ import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; - -import static muramasa.gregtech.data.Materials.*; +import org.gtreimagined.block.*; +import org.gtreimagined.gt5r.block.*; public class GT5RBlocks { @@ -111,13 +112,13 @@ public Texture[] getTextures() { public static final BlockCasing CASING_UV = new BlockCasing(GT5RRef.ID, "casing_uv"); public static final BlockCasing CASING_UHV = new BlockCasing(GT5RRef.ID, "casing_uhv"); public static final BlockColoredWall WOOD_WALL = new BlockColoredWall(GT5RRef.ID, AntimatterMaterials.Wood, BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.WOOD).strength(2.0F, 3.0F).sound(SoundType.WOOD)); - public static final BlockColoredWall STEEL_WALL = new BlockColoredWall(GT5RRef.ID, Steel); - public static final BlockColoredWall INVAR_WALL = new BlockColoredWall(GT5RRef.ID, Invar); - public static final BlockColoredWall STAINLESS_STEEL_WALL = new BlockColoredWall(GT5RRef.ID, StainlessSteel); - public static final BlockColoredWall TITANIUM_WALL = new BlockColoredWall(GT5RRef.ID, Titanium); + public static final BlockColoredWall STEEL_WALL = new BlockColoredWall(GT5RRef.ID, Materials.Steel); + public static final BlockColoredWall INVAR_WALL = new BlockColoredWall(GT5RRef.ID, Materials.Invar); + public static final BlockColoredWall STAINLESS_STEEL_WALL = new BlockColoredWall(GT5RRef.ID, Materials.StainlessSteel); + public static final BlockColoredWall TITANIUM_WALL = new BlockColoredWall(GT5RRef.ID, Materials.Titanium); public static final BlockColoredWall NETHERITE_WALL = new BlockColoredWall(GT5RRef.ID, AntimatterMaterials.Netherite); - public static final BlockColoredWall TUNGSTENSTEEL_WALL = new BlockColoredWall(GT5RRef.ID, TungstenSteel); - public static final BlockColoredWall TUNGSTEN_WALL = new BlockColoredWall(GT5RRef.ID, Tungsten); + public static final BlockColoredWall TUNGSTENSTEEL_WALL = new BlockColoredWall(GT5RRef.ID, Materials.TungstenSteel); + public static final BlockColoredWall TUNGSTEN_WALL = new BlockColoredWall(GT5RRef.ID, Materials.Tungsten); public static final BlockCasing LONG_DIST_ITEM_PIPE = new BlockCasing(GT5RRef.ID, "long_distance_item_pipe"); public static final BlockCasing LONG_DIST_FLUID_PIPE = new BlockCasing(GT5RRef.ID, "long_distance_fluid_pipe"); public static final BlockCasing LONG_DIST_WIRE_EV = new BlockCasing(GT5RRef.ID, "long_distance_wire_ev", Block.Properties.of(Material.WOOL).strength(1.0f, 10.0f).sound(SoundType.WOOL)); @@ -176,102 +177,102 @@ public Texture[] getTextures() { public static final BlockCoil COIL_NAQUADAH_ALLOY = new BlockCoil(GT5RRef.ID, "naquadah_alloy_coil", new BlockCoil.CoilData(9001, 3.5f, 512,6)); public static final BlockCoil COIL_FUSION = new BlockCoil(GT5RRef.ID, "fusion_coil", new BlockCoil.CoilData(9001, 4.0f, 1024,7)); public static final BlockCoil COIL_SUPERCONDUCTOR = new BlockCoil(GT5RRef.ID, "superconductor_coil", new BlockCoil.CoilData(9001, 4.0f, 1024,7)); - public static final Cable CABLE_SOLDERING_ALLOY = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, SolderingAlloy, 0.02, Tier.ULV).amps(1)); - public static final Cable CABLE_COBALT = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Cobalt, 2, Tier.LV).amps(2)); //L); - public static final Cable CABLE_LEAD = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Lead, 2, Tier.LV).amps(2)); - public static final Cable CABLE_TIN = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Tin, 1, Tier.LV).amps(1)); - public static final Cable CABLE_ZINC = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Zinc, 1, Tier.LV).amps(1)); + public static final Cable CABLE_SOLDERING_ALLOY = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.SolderingAlloy, 0.02, Tier.ULV).amps(1)); + public static final Cable CABLE_COBALT = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Cobalt, 2, Tier.LV).amps(2)); //L); + public static final Cable CABLE_LEAD = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Lead, 2, Tier.LV).amps(2)); + public static final Cable CABLE_TIN = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Tin, 1, Tier.LV).amps(1)); + public static final Cable CABLE_ZINC = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Zinc, 1, Tier.LV).amps(1)); public static final Cable CABLE_IRON = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, AntimatterMaterials.Iron, 3, Tier.MV).amps(2)); //M); - public static final Cable CABLE_NICKEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Nickel, 3, Tier.MV).amps(3)); - public static final Cable CABLE_CUPRONICKEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Cupronickel, 3, Tier.MV).amps(2)); + public static final Cable CABLE_NICKEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Nickel, 3, Tier.MV).amps(3)); + public static final Cable CABLE_CUPRONICKEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Cupronickel, 3, Tier.MV).amps(2)); public static final Cable CABLE_COPPER = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, AntimatterMaterials.Copper, 2, Tier.MV).amps(1)); - public static final Cable CABLE_ANNEALED_COPPER = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, AnnealedCopper, 1, Tier.MV).amps(1)); - public static final Cable CABLE_KANTHAL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Kanthal, 3, Tier.HV).amps(4)); //H); + public static final Cable CABLE_ANNEALED_COPPER = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.AnnealedCopper, 1, Tier.MV).amps(1)); + public static final Cable CABLE_KANTHAL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Kanthal, 3, Tier.HV).amps(4)); //H); public static final Cable CABLE_GOLD = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, AntimatterMaterials.Gold, 2, Tier.HV).amps(3)); - public static final Cable CABLE_ELECTRUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Electrum, 2, Tier.HV).amps(2)); - public static final Cable CABLE_SILVER = AntimatterAPI.register(Cable.class,new Cable<>(GT5RRef.ID, Silver, 1, Tier.HV).amps(1)); - public static final Cable CABLE_NICHROME = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Nichrome, 4, Tier.EV).amps(3)); //E); - public static final Cable CABLE_STEEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Steel, 2, Tier.EV).amps(2)); - public static final Cable CABLE_TITANIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Titanium, 2, Tier.EV).amps(4)); - public static final Cable CABLE_ALUMINIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Aluminium, 1, Tier.EV).amps(1)); - public static final Cable CABLE_GRAPHENE = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Graphene, 1, Tier.IV).amps(1)); //I); - public static final Cable CABLE_OSMIUM = AntimatterAPI.register(Cable.class,new Cable<>(GT5RRef.ID, Osmium, 2, Tier.IV).amps(4)); - public static final Cable CABLE_PLATINUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Platinum, 1, Tier.IV).amps(2)); - public static final Cable CABLE_TUNGSTEN_STEEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, TungstenSteel, 2, Tier.IV).amps(3)); - public static final Cable CABLE_TUNGSTEN = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Tungsten, 2, Tier.IV).amps(1)); - public static final Cable CABLE_HSSG = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, HSSG, 2, Tier.LUV).amps(4)); //LU); - public static final Cable CABLE_NIOBIUM_TITANIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, NiobiumTitanium, 2, Tier.LUV).amps(4)); - public static final Cable CABLE_VANADIUM_GALLIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, VanadiumGallium, 2, Tier.LUV).amps(4)); - public static final Cable CABLE_YTTRIUM_BARIUM_CUPRATE = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, YttriumBariumCuprate, 4, Tier.LUV).amps(4)); - public static final Cable CABLE_NAQUADAH = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Naquadah, 2, Tier.ZPM).amps(2)); //ZP); - public static final Cable CABLE_NAQUADAH_ALLOY = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, NaquadahAlloy, 4, Tier.ZPM).amps(2)); - public static final Cable CABLE_DURANIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Duranium, 8, Tier.ZPM).amps(1)); - public static final Cable CABLE_SUPERCONDUCTOR = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Superconductor, 0.1, Tier.UHV).amps(4)).loss(0.1); //MA); - public static final Wire WIRE_SOLDERING_ALLOY = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, SolderingAlloy, 0.04, Tier.ULV).amps(1)); - public static final Wire WIRE_COBALT = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Cobalt, 4, Tier.LV).amps(2)); //L); - public static final Wire WIRE_LEAD = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Lead, 4, Tier.LV).amps(2)); - public static final Wire WIRE_TIN = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Tin, 2, Tier.LV).amps(1)); - public static final Wire WIRE_ZINC = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Zinc, 2, Tier.LV).amps(1)); + public static final Cable CABLE_ELECTRUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Electrum, 2, Tier.HV).amps(2)); + public static final Cable CABLE_SILVER = AntimatterAPI.register(Cable.class,new Cable<>(GT5RRef.ID, Materials.Silver, 1, Tier.HV).amps(1)); + public static final Cable CABLE_NICHROME = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Nichrome, 4, Tier.EV).amps(3)); //E); + public static final Cable CABLE_STEEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Steel, 2, Tier.EV).amps(2)); + public static final Cable CABLE_TITANIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Titanium, 2, Tier.EV).amps(4)); + public static final Cable CABLE_ALUMINIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Aluminium, 1, Tier.EV).amps(1)); + public static final Cable CABLE_GRAPHENE = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Graphene, 1, Tier.IV).amps(1)); //I); + public static final Cable CABLE_OSMIUM = AntimatterAPI.register(Cable.class,new Cable<>(GT5RRef.ID, Materials.Osmium, 2, Tier.IV).amps(4)); + public static final Cable CABLE_PLATINUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Platinum, 1, Tier.IV).amps(2)); + public static final Cable CABLE_TUNGSTEN_STEEL = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.TungstenSteel, 2, Tier.IV).amps(3)); + public static final Cable CABLE_TUNGSTEN = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Tungsten, 2, Tier.IV).amps(1)); + public static final Cable CABLE_HSSG = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.HSSG, 2, Tier.LUV).amps(4)); //LU); + public static final Cable CABLE_NIOBIUM_TITANIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.NiobiumTitanium, 2, Tier.LUV).amps(4)); + public static final Cable CABLE_VANADIUM_GALLIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.VanadiumGallium, 2, Tier.LUV).amps(4)); + public static final Cable CABLE_YTTRIUM_BARIUM_CUPRATE = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.YttriumBariumCuprate, 4, Tier.LUV).amps(4)); + public static final Cable CABLE_NAQUADAH = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Naquadah, 2, Tier.ZPM).amps(2)); //ZP); + public static final Cable CABLE_NAQUADAH_ALLOY = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.NaquadahAlloy, 4, Tier.ZPM).amps(2)); + public static final Cable CABLE_DURANIUM = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Duranium, 8, Tier.ZPM).amps(1)); + public static final Cable CABLE_SUPERCONDUCTOR = AntimatterAPI.register(Cable.class, new Cable<>(GT5RRef.ID, Materials.Superconductor, 0.1, Tier.UHV).amps(4)).loss(0.1); //MA); + public static final Wire WIRE_SOLDERING_ALLOY = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.SolderingAlloy, 0.04, Tier.ULV).amps(1)); + public static final Wire WIRE_COBALT = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Cobalt, 4, Tier.LV).amps(2)); //L); + public static final Wire WIRE_LEAD = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Lead, 4, Tier.LV).amps(2)); + public static final Wire WIRE_TIN = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Tin, 2, Tier.LV).amps(1)); + public static final Wire WIRE_ZINC = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Zinc, 2, Tier.LV).amps(1)); public static final Wire WIRE_IRON = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, AntimatterMaterials.Iron, 6, Tier.MV).amps(2)); //M); - public static final Wire WIRE_NICKEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Nickel, 6, Tier.MV).amps(3)); - public static final Wire WIRE_CUPRONICKEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Cupronickel, 6, Tier.MV).amps(2)); + public static final Wire WIRE_NICKEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Nickel, 6, Tier.MV).amps(3)); + public static final Wire WIRE_CUPRONICKEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Cupronickel, 6, Tier.MV).amps(2)); public static final Wire WIRE_COPPER = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, AntimatterMaterials.Copper, 4, Tier.MV).amps(1)); - public static final Wire WIRE_ANNEALED_COPPER = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, AnnealedCopper, 2, Tier.MV).amps(1)); - public static final Wire WIRE_KANTHAL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Kanthal, 6, Tier.HV).amps(4)); //H); + public static final Wire WIRE_ANNEALED_COPPER = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.AnnealedCopper, 2, Tier.MV).amps(1)); + public static final Wire WIRE_KANTHAL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Kanthal, 6, Tier.HV).amps(4)); //H); public static final Wire WIRE_GOLD = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, AntimatterMaterials.Gold, 4, Tier.HV).amps(3)); - public static final Wire WIRE_ELECTRUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Electrum, 4, Tier.HV).amps(2)); - public static final Wire WIRE_SILVER = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Silver, 2, Tier.HV).amps(1)); - public static final Wire WIRE_NICHROME = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Nichrome, 8, Tier.EV).amps(3)); //E); - public static final Wire WIRE_STEEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Steel, 4, Tier.EV).amps(2)); - public static final Wire WIRE_TITANIUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Titanium, 4, Tier.EV).amps(4)); - public static final Wire WIRE_ALUMINIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Aluminium, 2, Tier.EV).amps(1)); - public static final Wire WIRE_GRAPHENE = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Graphene, 2, Tier.IV).amps(1)); //I); - public static final Wire WIRE_OSMIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Osmium, 4, Tier.IV).amps(4)); - public static final Wire WIRE_PLATINUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Platinum, 2, Tier.IV).amps(2)); - public static final Wire WIRE_TUNGSTEN_STEEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, TungstenSteel, 2, Tier.IV).amps(3)); - public static final Wire WIRE_TUNGSTEN = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Tungsten, 2, Tier.IV).amps(1)); - public static final Wire WIRE_HSSG = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, HSSG, 4, Tier.LUV).amps(4)); //LU); - public static final Wire WIRE_NIOBIUM_TITANIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, NiobiumTitanium, 4, Tier.LUV).amps(4)); - public static final Wire WIRE_VANADIUM_GALLIUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, VanadiumGallium, 4, Tier.LUV).amps(4)); - public static final Wire WIRE_YTTRIUM_BARIUM_CUPRATE = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, YttriumBariumCuprate, 8, Tier.LUV).amps(4)); - public static final Wire WIRE_NAQUADAH = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Naquadah, 4, Tier.ZPM).amps(2)); //ZP); - public static final Wire WIRE_NAQUADAH_ALLOY = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, NaquadahAlloy, 8, Tier.ZPM).amps(2)); - public static final Wire WIRE_DURANIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Duranium, 16, Tier.ZPM).amps(1)); - public static final Wire WIRE_SUPERCONDUCTOR = (Wire) AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Superconductor, 1, Tier.UHV).amps(4)).loss(0.2); //MA); + public static final Wire WIRE_ELECTRUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Electrum, 4, Tier.HV).amps(2)); + public static final Wire WIRE_SILVER = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Silver, 2, Tier.HV).amps(1)); + public static final Wire WIRE_NICHROME = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Nichrome, 8, Tier.EV).amps(3)); //E); + public static final Wire WIRE_STEEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Steel, 4, Tier.EV).amps(2)); + public static final Wire WIRE_TITANIUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Titanium, 4, Tier.EV).amps(4)); + public static final Wire WIRE_ALUMINIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Materials.Aluminium, 2, Tier.EV).amps(1)); + public static final Wire WIRE_GRAPHENE = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Graphene, 2, Tier.IV).amps(1)); //I); + public static final Wire WIRE_OSMIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Materials.Osmium, 4, Tier.IV).amps(4)); + public static final Wire WIRE_PLATINUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Platinum, 2, Tier.IV).amps(2)); + public static final Wire WIRE_TUNGSTEN_STEEL = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.TungstenSteel, 2, Tier.IV).amps(3)); + public static final Wire WIRE_TUNGSTEN = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.Tungsten, 2, Tier.IV).amps(1)); + public static final Wire WIRE_HSSG = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.HSSG, 4, Tier.LUV).amps(4)); //LU); + public static final Wire WIRE_NIOBIUM_TITANIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Materials.NiobiumTitanium, 4, Tier.LUV).amps(4)); + public static final Wire WIRE_VANADIUM_GALLIUM = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.VanadiumGallium, 4, Tier.LUV).amps(4)); + public static final Wire WIRE_YTTRIUM_BARIUM_CUPRATE = AntimatterAPI.register(Wire.class, new Wire<>(GT5RRef.ID, Materials.YttriumBariumCuprate, 8, Tier.LUV).amps(4)); + public static final Wire WIRE_NAQUADAH = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Materials.Naquadah, 4, Tier.ZPM).amps(2)); //ZP); + public static final Wire WIRE_NAQUADAH_ALLOY = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Materials.NaquadahAlloy, 8, Tier.ZPM).amps(2)); + public static final Wire WIRE_DURANIUM = AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Materials.Duranium, 16, Tier.ZPM).amps(1)); + public static final Wire WIRE_SUPERCONDUCTOR = (Wire) AntimatterAPI.register(Wire.class,new Wire<>(GT5RRef.ID, Materials.Superconductor, 1, Tier.UHV).amps(4)).loss(0.2); //MA); public static final FluidPipe FLUID_PIPE_WOOD = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, AntimatterMaterials.Wood, 350, false).caps(1).pressures(getPressures(150))); public static final FluidPipe FLUID_PIPE_COPPER = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, AntimatterMaterials.Copper, 1696, true).caps(1).pressures(getPressures(300))); - public static final FluidPipe FLUID_PIPE_BRONZE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Bronze, 1696, true).caps(1).pressures(getPressures(450))); + public static final FluidPipe FLUID_PIPE_BRONZE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Materials.Bronze, 1696, true).caps(1).pressures(getPressures(450))); // it's not in gt6, not sure whether to keep it or not //public static final FluidPipe FLUID_PIPE_BISMUTH_BRONZE = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, BismuthBronze, 950, true).caps(1).pressures(800)); //public static final FluidPipe FLUID_PIPE_BLACK_STEEL = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, BlackSteel, 1200, true).caps(1).pressures(900)); public static final FluidPipe FLUID_PIPE_GOLD = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, AntimatterMaterials.Gold, 1671, true).acidProof(true).pressures(getPressures(300))); - public static final FluidPipe FLUID_PIPE_INVAR = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Invar, 2395, true).caps(1).pressures(getPressures(600)).heatProof(true)); - public static final FluidPipe FLUID_PIPE_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Steel, 2557, true).caps(1).pressures(getPressures(600))); - public static final FluidPipe FLUID_PIPE_CHROMIUM = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Chromium, 2725, true).acidProof(true).pressures(getPressures(600))); - public static final FluidPipe FLUID_PIPE_STAINLESS_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, StainlessSteel, 2428, true).acidProof(true).caps(1).pressures(getPressures(750))); + public static final FluidPipe FLUID_PIPE_INVAR = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Materials.Invar, 2395, true).caps(1).pressures(getPressures(600)).heatProof(true)); + public static final FluidPipe FLUID_PIPE_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Materials.Steel, 2557, true).caps(1).pressures(getPressures(600))); + public static final FluidPipe FLUID_PIPE_CHROMIUM = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.Chromium, 2725, true).acidProof(true).pressures(getPressures(600))); + public static final FluidPipe FLUID_PIPE_STAINLESS_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Materials.StainlessSteel, 2428, true).acidProof(true).caps(1).pressures(getPressures(750))); public static final FluidPipe FLUID_PIPE_NETHERRITE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, AntimatterMaterials.Netherite, 2807, true).acidProof(true).caps(1).pressures(getPressures(900))); - public static final FluidPipe FLUID_PIPE_TUNGSTEN = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Tungsten, 4618, true).acidProof(true).caps(1).pressures(getPressures(1050))); - public static final FluidPipe FLUID_PIPE_TITANIUM = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Titanium, 1668, true).caps(1).pressures(getPressures(900))); - public static final FluidPipe FLUID_PIPE_TUNGSTEN_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, TungstenSteel, 3587, true).caps(1).pressures(getPressures(1200))); - public static final FluidPipe FLUID_PIPE_TUNGSTEN_CARBIDE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, TungstenCarbide, 3837, true).caps(1).pressures(getPressures(1350))); - public static final FluidPipe FLUID_PIPE_VANADIUM_STEEL = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, VanadiumSteel, 2591, true).acidProof(true).pressures(getPressures(1200))); - public static final FluidPipe FLUID_PIPE_RUBBER = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Rubber, 350, true).caps(1).pressures(getPressures(300))); - public static final FluidPipe FLUID_PIPE_PLASTIC = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Plastic, 370, true).caps(1).pressures(getPressures(300))); - public static final FluidPipe FLUID_PIPE_PVC = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, PolyvinylChloride, 333, true).caps(1).pressures(getPressures(450))); - public static final FluidPipe FLUID_PIPE_HP = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, HighPressure, 3422, true).sizes(PipeSize.SMALL, PipeSize.NORMAL, PipeSize.LARGE).caps(1).pressures(10000)); - public static final FluidPipe FLUID_PIPE_PLASMA = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, PlasmaContainment, 100000, true).sizes(PipeSize.NORMAL).caps(1).pressures(100000)); - public static final ItemPipe ITEM_PIPE_BRASS = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Brass).stepsize(32768).caps(0, 0, 0, 1, 2, 4)); - public static final ItemPipe ITEM_PIPE_CUPRONICKEL = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Cupronickel).stepsize(32768).caps(0, 0, 0, 1, 2, 4)); - public static final ItemPipe ITEM_PIPE_BLACK_BRONZE = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, BlackBronze).stepsize(16384).caps(0, 0, 0, 2, 4, 8)); - public static final ItemPipe ITEM_PIPE_STERLING_SILVER = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, SterlingSilver).stepsize(16384).caps(0,0,0,2,4,8)); - public static final ItemPipe ITEM_PIPE_ROSE_GOLD = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, RoseGold).stepsize(16384).caps(0,0,0,2,4,8)); - public static final ItemPipe ITEM_PIPE_ELECTRUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Electrum).stepsize(16384).caps(0, 0, 0, 2, 4, 8)); - public static final ItemPipe ITEM_PIPE_MAGNALIUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Magnalium).stepsize(16384).caps(0, 0, 0, 2, 4, 8)); - public static final ItemPipe ITEM_PIPE_PLATINUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Platinum).stepsize(8192).caps(0, 0, 0, 4, 8, 16)); - public static final ItemPipe ITEM_PIPE_OSMIUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Osmium).stepsize(4096).caps(0, 0, 0, 8, 16, 32)); - public static final ItemPipe ITEM_PIPE_ULTIMET = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Ultimet).stepsize(2048).caps(0, 0, 0, 16, 32, 64)); + public static final FluidPipe FLUID_PIPE_TUNGSTEN = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Materials.Tungsten, 4618, true).acidProof(true).caps(1).pressures(getPressures(1050))); + public static final FluidPipe FLUID_PIPE_TITANIUM = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.Titanium, 1668, true).caps(1).pressures(getPressures(900))); + public static final FluidPipe FLUID_PIPE_TUNGSTEN_STEEL = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Materials.TungstenSteel, 3587, true).caps(1).pressures(getPressures(1200))); + public static final FluidPipe FLUID_PIPE_TUNGSTEN_CARBIDE = AntimatterAPI.register(FluidPipe.class,new FluidPipe<>(GT5RRef.ID, Materials.TungstenCarbide, 3837, true).caps(1).pressures(getPressures(1350))); + public static final FluidPipe FLUID_PIPE_VANADIUM_STEEL = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.VanadiumSteel, 2591, true).acidProof(true).pressures(getPressures(1200))); + public static final FluidPipe FLUID_PIPE_RUBBER = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.Rubber, 350, true).caps(1).pressures(getPressures(300))); + public static final FluidPipe FLUID_PIPE_PLASTIC = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.Plastic, 370, true).caps(1).pressures(getPressures(300))); + public static final FluidPipe FLUID_PIPE_PVC = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.PolyvinylChloride, 333, true).caps(1).pressures(getPressures(450))); + public static final FluidPipe FLUID_PIPE_HP = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.HighPressure, 3422, true).sizes(PipeSize.SMALL, PipeSize.NORMAL, PipeSize.LARGE).caps(1).pressures(10000)); + public static final FluidPipe FLUID_PIPE_PLASMA = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.PlasmaContainment, 100000, true).sizes(PipeSize.NORMAL).caps(1).pressures(100000)); + public static final ItemPipe ITEM_PIPE_BRASS = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Brass).stepsize(32768).caps(0, 0, 0, 1, 2, 4)); + public static final ItemPipe ITEM_PIPE_CUPRONICKEL = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Cupronickel).stepsize(32768).caps(0, 0, 0, 1, 2, 4)); + public static final ItemPipe ITEM_PIPE_BLACK_BRONZE = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.BlackBronze).stepsize(16384).caps(0, 0, 0, 2, 4, 8)); + public static final ItemPipe ITEM_PIPE_STERLING_SILVER = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.SterlingSilver).stepsize(16384).caps(0,0,0,2,4,8)); + public static final ItemPipe ITEM_PIPE_ROSE_GOLD = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.RoseGold).stepsize(16384).caps(0,0,0,2,4,8)); + public static final ItemPipe ITEM_PIPE_ELECTRUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Electrum).stepsize(16384).caps(0, 0, 0, 2, 4, 8)); + public static final ItemPipe ITEM_PIPE_MAGNALIUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Magnalium).stepsize(16384).caps(0, 0, 0, 2, 4, 8)); + public static final ItemPipe ITEM_PIPE_PLATINUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Platinum).stepsize(8192).caps(0, 0, 0, 4, 8, 16)); + public static final ItemPipe ITEM_PIPE_OSMIUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Osmium).stepsize(4096).caps(0, 0, 0, 8, 16, 32)); + public static final ItemPipe ITEM_PIPE_ULTIMET = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Ultimet).stepsize(2048).caps(0, 0, 0, 16, 32, 64)); //public static final ItemPipe ITEM_PIPE_HC = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, HighCapacity).stepsize(4096).caps(64)); - public static final ItemPipe ITEM_PIPE_OSMIRIDIUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Osmiridium).stepsize(1024).caps(0, 0, 0, 32, 64, 128)); + public static final ItemPipe ITEM_PIPE_OSMIRIDIUM = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Osmiridium).stepsize(1024).caps(0, 0, 0, 32, 64, 128)); public static void init(){ } diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RCovers.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RCovers.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/data/GT5RCovers.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RCovers.java index bc72cf28e..894a331d0 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RCovers.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RCovers.java @@ -1,21 +1,25 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import earth.terrarium.botarium.common.fluid.base.PlatformFluidItemHandler; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; +import org.gtreimagined.gt5r.GT5RRef; +import gtreimagined.gt5r.cover.*; +import org.gtreimagined.gt5r.cover.*; +import org.gtreimagined.gt5r.cover.redstone.*; +import org.gtreimagined.gt5r.items.ItemCoverCustomTooltip; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.pipe.BlockEntityItemPipe; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.item.ItemCover; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.cover.*; -import muramasa.gregtech.cover.redstone.*; -import muramasa.gregtech.items.ItemCoverCustomTooltip; +import muramasa.gt5r.cover.*; +import muramasa.gt5r.cover.redstone.*; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.cover.*; import tesseract.FluidPlatformUtils; public class GT5RCovers { @@ -112,13 +116,13 @@ public class GT5RCovers { public static final CoverFactory COVER_PROGRESS_SENSOR = CoverFactory.builder(CoverProgressSensor::new).item((a, b) -> { return new ItemCover(GT5RRef.ID, "progress_sensor"); }).addTextures(new Texture(GT5RRef.ID, "block/cover/progress_sensor")).build(GT5RRef.ID, "progress_sensor"); - public static final CoverFactory COVER_ACTIVITY_DETECTOR_PROCESSING = CoverFactory.builder(CoverActivityDetectorProcessing::new).item((a,b) -> { + public static final CoverFactory COVER_ACTIVITY_DETECTOR_PROCESSING = CoverFactory.builder(CoverActivityDetectorProcessing::new).item((a, b) -> { return new ItemCover(GT5RRef.ID, "activity_detector_processing"); }).addTextures(new Texture(GT5RRef.ID, "block/cover/activity_detector_processing")).build(GT5RRef.ID, "activity_detector_processing"); - public static final CoverFactory COVER_ACTIVITY_DETECTOR_SUCCESSFUL = CoverFactory.builder(CoverActivityDetectorSuccessful::new).item((a,b) -> { + public static final CoverFactory COVER_ACTIVITY_DETECTOR_SUCCESSFUL = CoverFactory.builder(CoverActivityDetectorSuccessful::new).item((a, b) -> { return new ItemCover(GT5RRef.ID, "activity_detector_successful"); }).addTextures(new Texture(GT5RRef.ID, "block/cover/activity_detector_successful")).build(GT5RRef.ID, "activity_detector_successful"); - public static final CoverFactory COVER_ACTIVITY_DETECTOR_POSSIBLE = CoverFactory.builder(CoverActivityDetectorPossible::new).item((a,b) -> { + public static final CoverFactory COVER_ACTIVITY_DETECTOR_POSSIBLE = CoverFactory.builder(CoverActivityDetectorPossible::new).item((a, b) -> { return new ItemCover(GT5RRef.ID, "activity_detector_possible"); }).addTextures(new Texture(GT5RRef.ID, "block/cover/activity_detector_possible")).build(GT5RRef.ID, "activity_detector_possible"); public static final CoverFactory COVER_ENERGY_DETECTOR = CoverFactory.builder(CoverEnergyDetector::new).item((a, b) -> { diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RData.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RData.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/data/GT5RData.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RData.java index c3acd31f5..f00189a6c 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RData.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RData.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import muramasa.antimatter.registration.Side; import net.minecraft.world.item.DyeColor; diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RItems.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RItems.java similarity index 80% rename from common/src/main/java/muramasa/gregtech/data/GT5RItems.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RItems.java index ed1a05696..6c05d9dc3 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RItems.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RItems.java @@ -1,23 +1,24 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5Reimagined; +import gtreimagined.gt5r.items.*; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.item.ItemBattery; import muramasa.antimatter.item.ItemFluidCell; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.items.*; +import muramasa.gt5r.items.*; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; - -import static muramasa.gregtech.data.Materials.*; +import org.gtreimagined.gt5r.items.*; +import org.gtreimagined.items.*; public class GT5RItems { public static ItemBasic ComputerMonitor = new ItemBasic<>(GT5RRef.ID, "computer_monitor").tip("Can be placed on machines as a cover"); public static ItemPortableScanner PortableScanner = new ItemPortableScanner(); - public static ItemFluidCell CellTin = new ItemFluidCell(GT5RRef.ID, Tin, 1000); - public static ItemFluidCell CellSteel = new ItemFluidCell(GT5RRef.ID, Steel, 16000); - public static ItemFluidCell CellTungstensteel = new ItemFluidCell(GT5RRef.ID, TungstenSteel, 64000); + public static ItemFluidCell CellTin = new ItemFluidCell(GT5RRef.ID, Materials.Tin, 1000); + public static ItemFluidCell CellSteel = new ItemFluidCell(GT5RRef.ID, Materials.Steel, 16000); + public static ItemFluidCell CellTungstensteel = new ItemFluidCell(GT5RRef.ID, Materials.TungstenSteel, 64000); public static ItemBasic Scrap = new ItemBasic<>(GT5RRef.ID, "scrap"); public static ItemBasic WoodPellet = new ItemBasic<>(GT5RRef.ID, "wood_pellet"); public static ItemBasic PrintedPages = new ItemPrintedPages(GT5RRef.ID, "printed_pages").tip("Used to make written Books"); @@ -111,43 +112,43 @@ public class GT5RItems { public static ItemBasic SOC = new ItemBasic<>(GT5RRef.ID, "soc", "silicon/"); public static ItemBasic BatteryTantalum = new ItemBattery(GT5RRef.ID, "tantalum_capacitor", Tier.ULV, 10000, true).tip("Reusable"); public static ItemComponentRod EmptyNuclearFuelRod = new ItemComponentRod(GT5RRef.ID, "empty_nuclear_fuel_rod", muramasa.antimatter.material.Material.NULL, 1); - public static ItemComponentRod NeutronAbsorberRod = new ItemComponentRod(GT5RRef.ID, "neutron_absorber_rod", CdInAGAlloy, 1); - public static ItemComponentRod NeutronReflectorRod = new ItemComponentRod(GT5RRef.ID, "neutron_reflector_rod", Beryllium, 1); - public static ItemComponentRod NeutronModeratorRod = new ItemComponentRod(GT5RRef.ID, "neutron_moderator_rod", Graphite, 3); - public static ItemNuclearFuelRod Thorium232Rod = new ItemNuclearFuelRod(GT5RRef.ID, Thorium, 6_000_000_000L, 2,2,128, 32); - public static ItemNuclearFuelRod Uranium238Rod = new ItemNuclearFuelRod(GT5RRef.ID, Uranium, 3_000_000_000L, 4,4,512, 16); - public static ItemNuclearFuelRod Uranium235Rod = new ItemNuclearFuelRod(GT5RRef.ID, Uranium235, 600_000_000, 32,32,2048, 4); - public static ItemNuclearFuelRod Uranium233Rod = new ItemNuclearFuelRod(GT5RRef.ID, Uranium233, 3_000_000_000L, 32,32,2048, 4); - public static ItemNuclearFuelRod Plutonium244Rod = new ItemNuclearFuelRod(GT5RRef.ID, Plutonium, 600_000_000, 64,64,2048, 4); - public static ItemNuclearFuelRod Plutonium241Rod = new ItemNuclearFuelRod(GT5RRef.ID, Plutonium241, 600_000_000, 128,128,3072, 3); - public static ItemNuclearFuelRod Plutonium243Rod = new ItemNuclearFuelRod(GT5RRef.ID, Plutonium243, 600_000_000, 128,128,4096, 3); - public static ItemNuclearFuelRod Plutonium239Rod = new ItemNuclearFuelRod(GT5RRef.ID, Plutonium239, 1_200_000_000, 128,128,4096, 3); - public static ItemNuclearFuelRod Americium245Rod = new ItemNuclearFuelRod(GT5RRef.ID, Americium, 600_000_000, 64,64,4096, 4); - public static ItemNuclearFuelRod Americium241Rod = new ItemNuclearFuelRod(GT5RRef.ID, Americium241, 600_000_000, 128,128,4096, 3); - public static ItemNuclearFuelRod Cobalt60Rod = new ItemNuclearFuelRod(GT5RRef.ID, Cobalt60, 60_000_000, 0,8,256, 16); - public static ItemNuclearFuelRod EnrichedNaquadahRod = new ItemNuclearFuelRod(GT5RRef.ID, EnrichedNaquadah, 6_000_000_000L, 128,128,8192, 4); - public static ItemNuclearFuelRod NaquadriaRod = new ItemNuclearFuelRod(GT5RRef.ID, Naquadria, 6_000_000_000L, 512,512,16384, 3); - public static ItemDepletedRod DepletedThorium232Rod = new ItemDepletedRod(GT5RRef.ID, Thorium); - public static ItemDepletedRod DepletedUranium238Rod = new ItemDepletedRod(GT5RRef.ID, Uranium); - public static ItemDepletedRod DepletedUranium235Rod = new ItemDepletedRod(GT5RRef.ID, Uranium235); - public static ItemDepletedRod DepletedUranium233Rod = new ItemDepletedRod(GT5RRef.ID, Uranium233); - public static ItemDepletedRod DepletedPlutonium244Rod = new ItemDepletedRod(GT5RRef.ID, Plutonium); - public static ItemDepletedRod DepletedPlutonium241Rod = new ItemDepletedRod(GT5RRef.ID, Plutonium241); - public static ItemDepletedRod DepletedPlutonium243Rod = new ItemDepletedRod(GT5RRef.ID, Plutonium243); - public static ItemDepletedRod DepletedPlutonium239Rod = new ItemDepletedRod(GT5RRef.ID, Plutonium239); - public static ItemDepletedRod DepletedAmericium245Rod = new ItemDepletedRod(GT5RRef.ID, Americium); - public static ItemDepletedRod DepletedAmericium241Rod = new ItemDepletedRod(GT5RRef.ID, Americium241); - public static ItemDepletedRod DepletedCobalt60Rod = new ItemDepletedRod(GT5RRef.ID, Cobalt60); - public static ItemDepletedRod DepletedEnrichedNaquadahRod = new ItemDepletedRod(GT5RRef.ID, EnrichedNaquadah); - public static ItemDepletedRod DepletedNaquadriaRod = new ItemDepletedRod(GT5RRef.ID, Naquadria); - public static ItemBreederRod Thorium232BreederRod = new ItemBreederRod(GT5RRef.ID, Thorium, () -> GT5Reimagined.get(Item.class, "uranium_233_enriched_rod"), 1000, 64_000_000); - public static ItemEnrichedRod Uranium233EnrichedRod = new ItemEnrichedRod(GT5RRef.ID, Uranium233, () -> Thorium232BreederRod); - public static ItemBreederRod Uranium238BreederRod = new ItemBreederRod(GT5RRef.ID, Uranium, () -> GT5Reimagined.get(Item.class, "plutonium_239_enriched_rod"), 2500, 256_000_000); - public static ItemEnrichedRod Plutonium239EnrichedRod = new ItemEnrichedRod(GT5RRef.ID, Plutonium239, () -> Uranium238BreederRod); - public static ItemBreederRod LithiumBreederRod = new ItemBreederRod(GT5RRef.ID, Lithium, () -> GT5Reimagined.get(Item.class, "tritium_enriched_rod"), 250, 640_000); - public static ItemEnrichedRod TritiumEnrichedRod = new ItemEnrichedRod(GT5RRef.ID, Tritium, () -> LithiumBreederRod); - public static ItemBreederRod NaquadahBreederRod = new ItemBreederRod(GT5RRef.ID, Naquadah, () -> GT5Reimagined.get(Item.class, "enriched_naquadah_enriched_rod"), 10000, 4_096_000_000L); - public static ItemEnrichedRod EnrichedNaquadahEnrichedRod = new ItemEnrichedRod(GT5RRef.ID, EnrichedNaquadah, () -> NaquadahBreederRod); + public static ItemComponentRod NeutronAbsorberRod = new ItemComponentRod(GT5RRef.ID, "neutron_absorber_rod", Materials.CdInAGAlloy, 1); + public static ItemComponentRod NeutronReflectorRod = new ItemComponentRod(GT5RRef.ID, "neutron_reflector_rod", Materials.Beryllium, 1); + public static ItemComponentRod NeutronModeratorRod = new ItemComponentRod(GT5RRef.ID, "neutron_moderator_rod", Materials.Graphite, 3); + public static ItemNuclearFuelRod Thorium232Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Thorium, 6_000_000_000L, 2,2,128, 32); + public static ItemNuclearFuelRod Uranium238Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Uranium, 3_000_000_000L, 4,4,512, 16); + public static ItemNuclearFuelRod Uranium235Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Uranium235, 600_000_000, 32,32,2048, 4); + public static ItemNuclearFuelRod Uranium233Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Uranium233, 3_000_000_000L, 32,32,2048, 4); + public static ItemNuclearFuelRod Plutonium244Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Plutonium, 600_000_000, 64,64,2048, 4); + public static ItemNuclearFuelRod Plutonium241Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Plutonium241, 600_000_000, 128,128,3072, 3); + public static ItemNuclearFuelRod Plutonium243Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Plutonium243, 600_000_000, 128,128,4096, 3); + public static ItemNuclearFuelRod Plutonium239Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Plutonium239, 1_200_000_000, 128,128,4096, 3); + public static ItemNuclearFuelRod Americium245Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Americium, 600_000_000, 64,64,4096, 4); + public static ItemNuclearFuelRod Americium241Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Americium241, 600_000_000, 128,128,4096, 3); + public static ItemNuclearFuelRod Cobalt60Rod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Cobalt60, 60_000_000, 0,8,256, 16); + public static ItemNuclearFuelRod EnrichedNaquadahRod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.EnrichedNaquadah, 6_000_000_000L, 128,128,8192, 4); + public static ItemNuclearFuelRod NaquadriaRod = new ItemNuclearFuelRod(GT5RRef.ID, Materials.Naquadria, 6_000_000_000L, 512,512,16384, 3); + public static ItemDepletedRod DepletedThorium232Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Thorium); + public static ItemDepletedRod DepletedUranium238Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Uranium); + public static ItemDepletedRod DepletedUranium235Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Uranium235); + public static ItemDepletedRod DepletedUranium233Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Uranium233); + public static ItemDepletedRod DepletedPlutonium244Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Plutonium); + public static ItemDepletedRod DepletedPlutonium241Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Plutonium241); + public static ItemDepletedRod DepletedPlutonium243Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Plutonium243); + public static ItemDepletedRod DepletedPlutonium239Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Plutonium239); + public static ItemDepletedRod DepletedAmericium245Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Americium); + public static ItemDepletedRod DepletedAmericium241Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Americium241); + public static ItemDepletedRod DepletedCobalt60Rod = new ItemDepletedRod(GT5RRef.ID, Materials.Cobalt60); + public static ItemDepletedRod DepletedEnrichedNaquadahRod = new ItemDepletedRod(GT5RRef.ID, Materials.EnrichedNaquadah); + public static ItemDepletedRod DepletedNaquadriaRod = new ItemDepletedRod(GT5RRef.ID, Materials.Naquadria); + public static ItemBreederRod Thorium232BreederRod = new ItemBreederRod(GT5RRef.ID, Materials.Thorium, () -> GT5Reimagined.get(Item.class, "uranium_233_enriched_rod"), 1000, 64_000_000); + public static ItemEnrichedRod Uranium233EnrichedRod = new ItemEnrichedRod(GT5RRef.ID, Materials.Uranium233, () -> Thorium232BreederRod); + public static ItemBreederRod Uranium238BreederRod = new ItemBreederRod(GT5RRef.ID, Materials.Uranium, () -> GT5Reimagined.get(Item.class, "plutonium_239_enriched_rod"), 2500, 256_000_000); + public static ItemEnrichedRod Plutonium239EnrichedRod = new ItemEnrichedRod(GT5RRef.ID, Materials.Plutonium239, () -> Uranium238BreederRod); + public static ItemBreederRod LithiumBreederRod = new ItemBreederRod(GT5RRef.ID, Materials.Lithium, () -> GT5Reimagined.get(Item.class, "tritium_enriched_rod"), 250, 640_000); + public static ItemEnrichedRod TritiumEnrichedRod = new ItemEnrichedRod(GT5RRef.ID, Materials.Tritium, () -> LithiumBreederRod); + public static ItemBreederRod NaquadahBreederRod = new ItemBreederRod(GT5RRef.ID, Materials.Naquadah, () -> GT5Reimagined.get(Item.class, "enriched_naquadah_enriched_rod"), 10000, 4_096_000_000L); + public static ItemEnrichedRod EnrichedNaquadahEnrichedRod = new ItemEnrichedRod(GT5RRef.ID, Materials.EnrichedNaquadah, () -> NaquadahBreederRod); public static void init(){ } diff --git a/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java new file mode 100644 index 000000000..ab62f4f85 --- /dev/null +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java @@ -0,0 +1,1487 @@ +package org.gtreimagined.gt5r.data; + +import org.gtreimagined.gt5r.material.GregTechMaterialEvent; +import muramasa.antimatter.Data; +import muramasa.antimatter.data.AntimatterDefaultTools; +import muramasa.antimatter.data.AntimatterMaterials; +import muramasa.antimatter.material.Material; +import muramasa.antimatter.material.MaterialTags; +import muramasa.antimatter.material.SubTag; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.enchantment.Enchantments; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreMaterials; + +import java.util.List; + +import static com.google.common.collect.ImmutableMap.of; +import static muramasa.antimatter.data.AntimatterMaterialTypes.*; +import static muramasa.antimatter.data.AntimatterMaterials.*; +import static muramasa.antimatter.material.MaterialTags.*; + +public class GT5RMaterialEvents { + public static void onMaterialEvent(GregTechMaterialEvent event){ + flags(event); + antimatterMaterials(event); + byproducts(event); + /** + *** Periodic Table of Elements (No Isotopes) + **/ + event.setMaterial(Materials.Hydrogen).asGas(20).fluidDensity(-1112); + event.setMaterial(Materials.Helium).asGas().fluidDensity(-560); + event.setMaterial(Materials.Lithium).asSolid(454, 0, BOLT, MOLTEN).asOre().harvestLevel(2); + event.setMaterial(Materials.Beryllium).asSolid(1560).asOre(); + event.setMaterial(Materials.Boron).asDust(2349); + event.setMaterial(Materials.Carbon).asDust(PLATE, MOLTEN).asFluid(); + event.setMaterial(Materials.Nitrogen).asGas().asFluid(0, 77); + event.setMaterial(Materials.Oxygen).asGas(); + event.setMaterial(Materials.Fluorine).asGas(); + event.setMaterial(Materials.Neon).asGas().fluidDensity(-111); + event.setMaterial(Materials.Sodium).asDust(370, MOLTEN).asFluid(); + event.setMaterial(Materials.Magnesium).asMetal(1383); + event.setMaterial(Materials.Aluminium).asMetal(933, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, FOIL, HAS_CUSTOM_SMELTING); + event.setMaterial(Materials.Silicon).asMetal(1687, PLATE, FOIL, GT5RMaterialTypes.BOULE); + event.setMaterial(Materials.Phosphor).asDust(933); + event.setMaterial(Materials.Sulfur).asDust(388, MOLTEN).asOre().harvestLevel(2).asFluid(); + event.setMaterial(Materials.Chlorine).asGas().fluidDensity(3); + event.setMaterial(Materials.Argon).asGas(); + event.setMaterial(Materials.Potassium).asSolid(337, MOLTEN); + event.setMaterial(Materials.Calcium).asDust(1115); + //Scandium, not added + event.setMaterial(Materials.Titanium).asMetal(1941, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, GEAR_SMALL, ROTOR, SPRING).forceBF(true); + event.setMaterial(Materials.Vanadium).asMetal(2183, INGOT_HOT); + event.setMaterial(Materials.Chromium).asMetal(2180, 1700, SCREW, BOLT, RING, PLATE, ROTOR).forceBF(false); + event.setMaterial(Materials.Manganese).asMetal(1519, FOIL).asOre(); + //Iron, added by vanilla + event.setMaterial(Materials.Cobalt).asMetal(1768, CRUSHED); + event.setMaterial(Materials.Nickel).asMetal(1728, PLATE).asOre(); + //Copper, by vanilla + event.setMaterial(Materials.Zinc).asMetal(692, PLATE, FOIL).asOre(); + event.setMaterial(Materials.Gallium).asMetal(303, MOLTEN); + event.setMaterial(Materials.Germanium).asMetal(1211); + event.setMaterial(Materials.Arsenic).asMetal(1090); + //event.setMaterial(Selenium).asMetal(494, 0); + //Bromine, not added + event.setMaterial(Materials.Krypton).asGas().fluidDensity(3); + //rubidium, strontium + event.setMaterial(Materials.Yttrium).asMetal(1799); + event.setMaterial(Materials.Zirconium).asMetal(2130).forceBF(true); + event.setMaterial(Materials.Niobium).asMetal(2750, GEAR); + event.setMaterial(Materials.Molybdenum).asMetal(2896).asOre(); + event.setMaterial(Materials.Technetium).asMetal(2430); + //event.setMaterial(Ruthenium).asMetal(2607,2607); + //event.setMaterial(Rhodium).asMetal(2237, 2237); + event.setMaterial(Materials.Palladium).asMetal(1828).forceBF(true); + event.setMaterial(Materials.Silver).asMetal(1234, PLATE, SCREW).asOre().harvestLevel(2); + event.setMaterial(Materials.Cadmium).asDust(594); + event.setMaterial(Materials.Indium).asSolid(430, MOLTEN); + event.setMaterial(Materials.Tin).asMetal(505, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FOIL, WIRE_FINE, FRAME, ROTOR).asOre().harvestLevel(1); + event.setMaterial(Materials.Antimony).asMetal(1449); + //Tellurium + event.setMaterial(Materials.Iodine).asSolid(387); + event.setMaterial(Materials.Xenon).asGas().fluidDensity(5); + event.setMaterial(Materials.Caesium).asMetal(301); + event.setMaterial(Materials.Barium).asDust(1000); + //Lanthanum + event.setMaterial(Materials.Cerium).asDust(); + //Praseodymium + event.setMaterial(Materials.Neodymium).asMetal(1297, PLATE, ROD_LONG).asOre().harvestLevel(2); // TODO: Bastnasite or Monazite for Ore For; + event.setMaterial(Materials.Promethium).asMetal(1353); + //Samarium + event.setMaterial(Materials.Europium).asMetal(1099, PLATE); + event.setMaterial(Materials.Gadolinium).asMetal(1585); + event.setMaterial(Materials.Terbium).asMetal(1696); + //dysprosium, holmium, erbium, thulium, ytterbium, lutetium + event.setMaterial(Materials.Hafnium).asMetal(2506); + event.setMaterial(Materials.Tantalum).asSolid(3290); + event.setMaterial(Materials.Tungsten).asMetal(3695, 3000, FOIL, RING, FRAME); + //event.setMaterial(Rhenium).asMetal(3459,3459); + event.setMaterial(Materials.Osmium).asOre().asMetal(3306, SCREW, BOLT, RING, PLATE, FOIL, ROD_LONG, WIRE_FINE); + event.setMaterial(Materials.Iridium).asMetal(2719, FRAME, PLATE, GT5RMaterialTypes.CHAMBER).asOre(); + event.setMaterial(Materials.Platinum).asMetal(2041, 0, PLATE, FOIL, ROD_LONG, WIRE_FINE, FRAME).asOre(); + //Gold, added by vanilla + event.setMaterial(Materials.Mercury).asFluid(); + // thalium + event.setMaterial(Materials.Lead).asMetal(600, PLATE, PLATE_DENSE, FOIL, ROD_LONG, FRAME, BOLT, RING).asOre().harvestLevel(1); + event.setMaterial(Materials.Bismuth).asOre(); + //polonium + //event.setMaterial(Astatine).asMetal(575, 0); + event.setMaterial(Materials.Radon).asGas().fluidDensity(9); + //event.setMaterial(Francium).asMetal(298, 0); + //event.setMaterial(Radium).asMetal(973, 0); + //event.setMaterial(Actinium).asMetal(1323, 0); + event.setMaterial(Materials.Thorium).asMetal(2115, 0, PLATE_DENSE).asOre(); + //protactinium + event.setMaterial(Materials.Uranium).asMetal(1405).harvestLevel(2); + //event.setMaterial(Neptunium).asMetal(912, 0); + event.setMaterial(Materials.Plutonium).asMetal(912); + event.setMaterial(Materials.Americium).asMetal(1149, ROD_LONG); + //Elements 96 - 118 not added + /** + *** Solids + **/ + /** + ** Metals + **/ + event.setMaterial(Materials.AnnealedCopper).asMetal(1357, PLATE, FOIL, ROD_LONG, WIRE_FINE, SCREW); + event.setMaterial(Materials.BatteryAlloy).asMetal(295, PLATE); + event.setMaterial(Materials.BismuthBronze).asMetal(1100, PLATE); + event.setMaterial(Materials.BlackBronze).asMetal(2000, FRAME); + event.setMaterial(Materials.BlackSteel).asMetal(1200, 1200, FRAME, PLATE).forceBF(false); + event.setMaterial(Materials.BlueSteel).asMetal(1400, 1400, FRAME).forceBF(false); + event.setMaterial(Materials.Brass).asMetal(1170, FRAME, ROD_LONG, PLATE, GEAR_SMALL); + event.setMaterial(Materials.Bronze).asMetal(1125, GEAR, FRAME, ROTOR); + event.setMaterial(Materials.CdInAGAlloy).asMetal(752, ROD); + event.setMaterial(Materials.CobaltBrass).asMetal(1500, GEAR); + event.setMaterial(Materials.Cupronickel).asMetal(1728, PLATE); + event.setMaterial(Materials.Duranium).asMetal(295, MOLTEN); + event.setMaterial(Materials.Electrum).asMetal(1330, PLATE, FOIL, ROD_LONG, WIRE_FINE); + event.setMaterial(Materials.EnrichedNaquadah).asMetal(4500, 4500, POSITIVE_CHANGING_RGB); + event.setMaterial(Materials.HSSE).asMetal(5400, 5400, GEAR, FRAME); + event.setMaterial(Materials.HSSG).asMetal(4500, 4500, GEAR, FRAME); + event.setMaterial(Materials.HSSS).asMetal(5400, 5400); + event.setMaterial(Materials.Invar).asMetal(1700, FRAME, RING); + event.setMaterial(Materials.IronMagnetic).asMetal(1811, ROD_LONG); + event.setMaterial(Materials.Kanthal).asMetal(1800).forceBF(true); + event.setMaterial(Materials.Magnalium).asMetal(870, PLATE, ROD_LONG); + event.setMaterial(Materials.NeodymiumMagnetic).asMetal(1297, ROD_LONG); + event.setMaterial(Materials.Neutronium).asMetal(10000, 10000, SCREW, BOLT, RING, GEAR, FRAME); + event.setMaterial(Materials.Naquadah).asMetal(5400, 5400).asOre(); + event.setMaterial(Materials.NaquadahAlloy).asMetal(7200, 7200); + event.setMaterial(Materials.Naquadria).asMetal(9000, 9000, POSITIVE_CHANGING_RGB); + event.setMaterial(Materials.Nichrome).asMetal(2700, 2700); + event.setMaterial(Materials.NickelZincFerrite).asMetal(1500, 1500); + event.setMaterial(Materials.NiobiumTitanium).asMetal(4500, 4500, PLATE, FOIL, ROD_LONG, WIRE_FINE, GEAR); + event.setMaterial(Materials.Osmiridium).asMetal(3333, 2500, FRAME); + event.setMaterial(Materials.RedAlloy).asMetal(295, PLATE, FOIL, ROD_LONG, WIRE_FINE); + event.setMaterial(Materials.RedSteel).asMetal(1300, 1300).forceBF(false); + event.setMaterial(Materials.RoseGold).asMetal(1600, WIRE_FINE); + event.setMaterial(Materials.SolderingAlloy).asMetal(400, PLATE, FOIL, ROD_LONG, WIRE_FINE); + event.setMaterial(Materials.Steel).asMetal(1811, 1000, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL, ITEM_CASING, WIRE_FINE).forceBF(false); + event.setMaterial(Materials.SteelMagnetic).asMetal(1000, 1000, ROD_LONG).forceBF(false); + event.setMaterial(Materials.SterlingSilver).asMetal(1700); + event.setMaterial(Materials.StainlessSteel).asMetal(1700, 1700, PLATE, PLATE_DENSE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL, ITEM_CASING).forceBF(false); + event.setMaterial(Materials.TinAlloy).asMetal(1158); + event.setMaterial(Materials.Tritanium).asMetal(295, FRAME, MOLTEN); + event.setMaterial(Materials.TungstenCarbide).asMetal(2460, 2460); + event.setMaterial(Materials.TungstenSteel).asMetal(3000, 3000, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL); + event.setMaterial(Materials.Ultimet).asMetal(2700, 2700, PLATE); + event.setMaterial(Materials.VanadiumGallium).asMetal(4500, 4500, ROD_LONG, PLATE); + event.setMaterial(Materials.VanadiumSteel).asMetal(1453, 1453).forceBF(false); + event.setMaterial(Materials.Vibranium).asMetal(295, FRAME); + event.setMaterial(Materials.WroughtIron).asMetal(1811, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL); + event.setMaterial(Materials.YttriumBariumCuprate).asMetal(4500, 4500, PLATE, FOIL, ROD_LONG, WIRE_FINE); + /** + ** Dusts + **/ + /** + * Organic + **/ + event.setMaterial(Materials.Ash).asDust(); + event.setMaterial(Materials.AntimonyTrioxide).asDust(); + event.setMaterial(Materials.Clay).asDust(); + event.setMaterial(Materials.CupricOxide).asDust(); + event.setMaterial(Materials.DarkAsh).asDust(); + event.setMaterial(Materials.Dibenzene).asDust(); + event.setMaterial(Materials.DibenzoylPeroxide).asDust(); + event.setMaterial(Materials.GelledToluene).asDust(); + event.setMaterial(Materials.Graphene).asDust(PLATE, WIRE_FINE); + event.setMaterial(Materials.Polydimethylsiloxane).asDust(); + event.setMaterial(Materials.RareEarth).asDust(); + event.setMaterial(Materials.RawRubber).asDust(RUBBERTOOLS); + event.setMaterial(Materials.RawStyreneButadieneRubber).asDust(RUBBERTOOLS); + event.setMaterial(Materials.SodaAsh).asDust(); + event.setMaterial(Wood).asDust(GEAR); + /** + * Inorganic + **/ + event.setMaterial(Materials.AluminiumHydroxide).asDust(); + event.setMaterial(Materials.AluminiumTrichloride).asDust(); + event.setMaterial(Materials.Aluminosilicate).asDust(); + event.setMaterial(Materials.AmmoniumChloride).asDust(); + event.setMaterial(Materials.ArsenicTrioxide).asDust(); + event.setMaterial(Materials.Biotite).asDust(); + event.setMaterial(Materials.Bitumen).asDust().asFluid(0, 1000).flags(MOLTEN); + event.setMaterial(Materials.BlackGranite).asDust(ROCK); + event.setMaterial(Materials.BlueSchist).asDust(ROCK); + event.setMaterial(Materials.BorosilicateGlass).asDust(); + event.setMaterial(Materials.Brick).asDust(); + event.setMaterial(Materials.CalciumChloride).asDust(); + event.setMaterial(Materials.CalciumSulfate).asDust(); + event.setMaterial(Materials.CobaltOxide).asDust(); + event.setMaterial(Materials.Concrete).asDust(300); + event.setMaterial(Materials.DialuminiumTrioxide).asDust(); + event.setMaterial(Materials.Energium).asDust(); + event.setMaterial(Materials.FerricChloride).asDust(); + event.setMaterial(Materials.FerriteMixture).asDust(); + event.setMaterial(Materials.Ferrosilite).asDust(); + event.setMaterial(Materials.Fireclay).asDust(); + event.setMaterial(Materials.Fluorite).asDust(); + event.setMaterial(Materials.GreenSchist).asDust(ROCK); + event.setMaterial(Materials.IndiumGalliumPhosphide).asSolid(349, PLATE, MOLTEN); + event.setMaterial(Materials.IridiumSodiumOxide).asDust(); + event.setMaterial(Materials.Kimberlite).asDust(ROCK); + event.setMaterial(Materials.Komatiite).asDust(ROCK); + event.setMaterial(Materials.Lapotronium).asFluid(); + event.setMaterial(Materials.Limestone).asDust(ROCK); + event.setMaterial(Materials.LithiumChloride).asSolid(880, MOLTEN); + event.setMaterial(Materials.MagnesiumCarbonate).asDust(); + event.setMaterial(Materials.MagnesiumChloride).asDust(); + event.setMaterial(Materials.Marble).asDust(ROCK); + event.setMaterial(Materials.Massicot).asDust(); + event.setMaterial(Materials.Obsidian).asDust(ROD_LONG, PLATE); + event.setMaterial(Materials.PlatinumGroupSludge).asDust(); + event.setMaterial(Materials.PhosphorousPentoxide).asDust(); + event.setMaterial(Materials.PotassiumBisulfate).asDust(); + event.setMaterial(Materials.PotassiumFeldspar).asDust(); + event.setMaterial(Materials.Powellite).asOre(1, 5, true).harvestLevel(2); + //event.setMaterial(Pyrochlore).asDust(ORE).addComposition(of(Calcium, 2, Niobium, 2, Oxygen, 7)); + event.setMaterial(Materials.Quartzite).asDust(ROCK); + event.setMaterial(Materials.Quicklime).asDust(); + event.setMaterial(Materials.ReactionCatalyst).asDust(); + event.setMaterial(Materials.RedGranite).asDust(ROCK); + event.setMaterial(Materials.SiliconDioxide).asDust(); + event.setMaterial(Materials.Shale).asDust(ROCK); + event.setMaterial(Materials.Slate).asDust(ROCK); + event.setMaterial(Materials.SodiumAluminate).asDust(); + event.setMaterial(Materials.SodiumBisulfate).asDust(); + event.setMaterial(Materials.SodiumPersulfate).asDust(); + event.setMaterial(Materials.SodiumHydroxide).asDust(); + event.setMaterial(Materials.SodiumSulfate).asDust(); + event.setMaterial(Materials.SodiumSulfide).asDust(); + event.setMaterial(Materials.TungsticAcid).asDust(); + event.setMaterial(Materials.TungstenTrioxide).asDust(); + event.setMaterial(Materials.Wollastonite).asDust(); + //Nuclear + + /** + ** Ores + **/ + event.setMaterial(Materials.Almandine).asOre().harvestLevel(1); + event.setMaterial(Materials.Alumina).asOre().asSolid(2345, MOLTEN); + event.setMaterial(Materials.Andradite).asOre(); + event.setMaterial(Materials.Hematite).asOre().harvestLevel(2); + event.setMaterial(Materials.Bastnasite).asOre().harvestLevel(2); + event.setMaterial(Materials.Barite).asOre().harvestLevel(2); + event.setMaterial(Materials.Bentonite).asOre(); // TODO: Ore Gen + event.setMaterial(Materials.BrownLimonite).asOre().harvestLevel(1); + event.setMaterial(Materials.Calcite).asOre(MOLTEN).asFluid(0, 1612).harvestLevel(1); + event.setMaterial(Materials.Cassiterite).asOre().harvestLevel(1); + event.setMaterial(Materials.Chalcopyrite).asOre().harvestLevel(1); + event.setMaterial(Materials.Cinnabar).asOre().harvestLevel(1); + event.setMaterial(Materials.Chromite).asOre().harvestLevel(2); + event.setMaterial(Materials.Cobaltite).asOre().harvestLevel(2); + event.setMaterial(Materials.Sheldonite).asOre().harvestLevel(2); + event.setMaterial(Materials.Galena).asOre().harvestLevel(3); + event.setMaterial(Materials.Garnierite).asOre().harvestLevel(3); + event.setMaterial(Materials.Glauconite).asOre().harvestLevel(2); // TODO: Ore Gen; + event.setMaterial(Materials.Graphite).asDust(ROD).asOre().harvestLevel(2); + event.setMaterial(Materials.Grossular).asOre().harvestLevel(1); + event.setMaterial(Materials.Ilmenite).asOre().harvestLevel(3); + event.setMaterial(Materials.Lepidolite).asOre().harvestLevel(2); // TODO: Ore Gen; + event.setMaterial(Materials.Rutile).asOre(); + event.setMaterial(Materials.Magnesite).asOre().harvestLevel(2); + event.setMaterial(Materials.Magnetite).asOre().harvestLevel(2); + event.setMaterial(Materials.Malachite).asOre().harvestLevel(2); + event.setMaterial(Materials.Molybdenite).asOre().harvestLevel(2); + event.setMaterial(Materials.Pentlandite).asOre().harvestLevel(2); + event.setMaterial(Materials.Phosphate).asOre().harvestLevel(1); + event.setMaterial(Materials.Pitchblende).asOre(); + event.setMaterial(Materials.Pyrite).asOre().harvestLevel(1); + event.setMaterial(Materials.Pyrolusite).asOre().harvestLevel(2); + event.setMaterial(Materials.Pyrope).asOre().harvestLevel(2); + event.setMaterial(Materials.Saltpeter).asOre(); + event.setMaterial(Materials.Scheelite).asDust(2500).asOre().harvestLevel(3); + event.setMaterial(Materials.Soapstone).asOre().harvestLevel(1); // TODO: Ore Gen; + event.setMaterial(Materials.Spodumene).asOre().harvestLevel(2); + event.setMaterial(Materials.Sperrylite).asOre().harvestLevel(2); + event.setMaterial(Materials.Spessartine).asOre().harvestLevel(2); + event.setMaterial(Materials.Sphalerite).asOre().harvestLevel(1); + event.setMaterial(Materials.Stibnite).asOre().harvestLevel(2); + event.setMaterial(Materials.Tantalite).asOre().harvestLevel(3); + event.setMaterial(Materials.Talc).asOre(); + event.setMaterial(Materials.Tetrahedrite).asOre().harvestLevel(2); + event.setMaterial(Materials.Tungstate).asOre().harvestLevel(3); + event.setMaterial(Materials.Uraninite).asOre().harvestLevel(2); + event.setMaterial(Materials.Uvarovite).asOre(); + event.setMaterial(Materials.VanadiumMagnetite).asOre().harvestLevel(2); + event.setMaterial(Materials.Wulfenite).asOre().harvestLevel(3); + event.setMaterial(Materials.YellowLimonite).asOre().harvestLevel(2); + event.setMaterial(Materials.Zircon).asOre(); + /** + ** Ore Stones + **/ + event.setMaterial(Materials.Bauxite).asOreStone(ORE_SMALL, ROCK).harvestLevel(1); + event.setMaterial(Materials.Lignite).asGemBasic(false).asOreStone(0, 2, ORE_SMALL, ROCK); + event.setMaterial(Materials.OilShale).asDust(ORE, ORE_STONE, ORE_SMALL, RAW_ORE, RAW_ORE_BLOCK, BEARING_ROCK, ROCK).setExpRange(1,5).harvestLevel(1); + event.setMaterial(Materials.RockSalt).asOreStone(ORE_SMALL, ROCK).harvestLevel(1); + event.setMaterial(Materials.Salt).asOreStone(ORE_SMALL, ROCK).harvestLevel(1); + /** + ** Gems + **/ + /** + * Regular + **/ + event.setMaterial(Materials.Amber).asGem(false).asOre(3, 7, true); + event.setMaterial(Materials.Amethyst).asGem(false).replaceItem(GEM_FLAWED, Items.AMETHYST_SHARD).asOre(3, 7, true); + event.setMaterial(Materials.Sapphire).asGem(true, GT5RMaterialTypes.BOULE).asOre(3, 7, true); + event.setMaterial(Materials.BlueTopaz).asGem(true).asOre(3, 7, true); + event.setMaterial(Materials.Glass).asFluid(0, 1500).asDust(PLATE, LENS, MOLTEN); + event.setMaterial(Materials.GreenSapphire).asGem(true, GT5RMaterialTypes.BOULE).asOre(3, 7, true); + event.setMaterial(Materials.Jade).asGem(false).asOre(3, 7, true); + event.setMaterial(Materials.Lazurite).asGemBasic(false, PLATE).asOre(2, 5, true).harvestLevel(1); + event.setMaterial(Materials.LigniteCoke).asGemBasic(false); + event.setMaterial(Materials.PetroleumCoke).asGemBasic(false); + event.setMaterial(Materials.Olivine).asGem(false, PLATE).asOre(3, 7, true); + event.setMaterial(Materials.Opal).asGem(true).asOre(3, 7, true); + event.setMaterial(Materials.TricalciumPhosphate).asOre(3, 7, true).harvestLevel(2); + event.setMaterial(Materials.MilkyQuartz).asGemBasic(false, BEARING_ROCK, ROD_LONG, QUARTZ_LIKE_BLOCKS).asOre(2, 5, true).harvestLevel(1); + event.setMaterial(Materials.RedGarnet).asGem(true).asOre(3, 7, true); + event.setMaterial(Materials.Ruby).asGem(true, GT5RMaterialTypes.BOULE).asOre(3, 7, true); + event.setMaterial(Materials.Sodalite).asGemBasic(false).asOre(2, 5, true).harvestLevel(1); + event.setMaterial(Materials.Tanzanite).asGem(false).asOre(3, 7, true); + event.setMaterial(Materials.Topaz).asGem(false).asOre(3, 7, true); + event.setMaterial(Materials.YellowGarnet).asGem(true).asOre(3, 7, true); + /** + * Basic + **/ + event.setMaterial(Materials.CertusQuartz).asGemBasic(false,PLATE, QUARTZ_LIKE_BLOCKS).asOre(1, 5, true); + event.setMaterial(Materials.Fluix).asGemBasic(false, QUARTZ_LIKE_BLOCKS); + event.setMaterial(Charcoal).asGemBasic(false); + event.setMaterial(Materials.CoalCoke).asGemBasic(false); + event.setMaterial(Materials.Apatite).asGemBasic(false, PLATE).asOre(2, 5, true).harvestLevel(1); + event.setMaterial(Materials.Monazite).asOre(3, 7, true).harvestLevel(1); + /** + ** Plastic Related + **/ + event.setMaterial(Materials.EpoxyResin).asSolid(400, 0, PLATE, MOLTEN); + event.setMaterial(Materials.FiberReinforcedEpoxyResin).flags(PLATE); + event.setMaterial(Materials.Plastic).asSolid(295, 0, PLATE, FOIL, FRAME).asFluid(); + //event.setMaterial(Polystyrene).asSolid(295, 0); + event.setMaterial(Materials.Polytetrafluoroethylene).asSolid(1400, 0, PLATE, FRAME, ROD_LONG); + event.setMaterial(Materials.PolyvinylChloride).asSolid(295, 0, PLATE, FOIL); + event.setMaterial(Materials.Rubber).asSolid(295, 0, PLATE, RING, MOLTEN); + event.setMaterial(Materials.SiliconeRubber).asSolid(900, 0, PLATE, FOIL, MOLTEN); + event.setMaterial(Materials.StyreneButadieneRubber).asSolid(295, 0, PLATE, RING); + /** + ** Misc + **/ + event.setMaterial(Materials.GalliumArsenide).asSolid(295, 1200, PLATE); + event.setMaterial(Materials.Superconductor).asSolid(PLATE); + /** + *** Fluids + **/ + /** + * Dyes + */ + event.setMaterial(Materials.WaterMixedWhiteDye).asFluid(); + event.setMaterial(Materials.WaterMixedOrangeDye).asFluid(); + event.setMaterial(Materials.WaterMixedMagentaDye).asFluid(); + event.setMaterial(Materials.WaterMixedLightBlueDye).asFluid(); + event.setMaterial(Materials.WaterMixedYellowDye).asFluid(); + event.setMaterial(Materials.WaterMixedLimeDye).asFluid(); + event.setMaterial(Materials.WaterMixedPinkDye).asFluid(); + event.setMaterial(Materials.WaterMixedGrayDye).asFluid(); + event.setMaterial(Materials.WaterMixedLightGrayDye).asFluid(); + event.setMaterial(Materials.WaterMixedCyanDye).asFluid(); + event.setMaterial(Materials.WaterMixedPurpleDye).asFluid(); + event.setMaterial(Materials.WaterMixedBlueDye).asFluid(); + event.setMaterial(Materials.WaterMixedBrownDye).asFluid(); + event.setMaterial(Materials.WaterMixedGreenDye).asFluid(); + event.setMaterial(Materials.WaterMixedRedDye).asFluid(); + event.setMaterial(Materials.WaterMixedBlackDye).asFluid(); + event.setMaterial(Materials.ChemicalWhiteDye).asFluid(); + event.setMaterial(Materials.ChemicalOrangeDye).asFluid(); + event.setMaterial(Materials.ChemicalMagentaDye).asFluid(); + event.setMaterial(Materials.ChemicalLightBlueDye).asFluid(); + event.setMaterial(Materials.ChemicalYellowDye).asFluid(); + event.setMaterial(Materials.ChemicalLimeDye).asFluid(); + event.setMaterial(Materials.ChemicalPinkDye).asFluid(); + event.setMaterial(Materials.ChemicalGrayDye).asFluid(); + event.setMaterial(Materials.ChemicalLightGrayDye).asFluid(); + event.setMaterial(Materials.ChemicalCyanDye).asFluid(); + event.setMaterial(Materials.ChemicalPurpleDye).asFluid(); + event.setMaterial(Materials.ChemicalBlueDye).asFluid(); + event.setMaterial(Materials.ChemicalBrownDye).asFluid(); + event.setMaterial(Materials.ChemicalGreenDye).asFluid(); + event.setMaterial(Materials.ChemicalRedDye).asFluid(); + event.setMaterial(Materials.ChemicalBlackDye).asFluid(); + + /** + * Organic + **/ + event.setMaterial(Materials.Acetone).asFluid(); + event.setMaterial(Materials.CharcoalByproducts).asGas(); + event.setMaterial(Materials.FermentedBiomass).asFluid(16); + event.setMaterial(Materials.SeedOil).asFluid(2).flags(GT5RMaterialTags.SEMIFUELS); + event.setMaterial(Materials.WoodTar).asFluid(); + event.setMaterial(Materials.WoodVinegar).asFluid(); + //Alkanoles + event.setMaterial(Materials.Methanol).asFluid(84); + event.setMaterial(Materials.Ethanol).asFluid(148); + event.setMaterial(Materials.Propanol).asFluid(196); + event.setMaterial(Materials.Butanol).asFluid(166); + event.setMaterial(Materials.Heptanol).asFluid(226); + //Alkenoles + event.setMaterial(Materials.Ethenol).asFluid(120); + event.setMaterial(Materials.Propenol).asFluid(196); + event.setMaterial(Materials.Butenol).asFluid(186); + //Alkanedioles + event.setMaterial(Materials.Ethanediol).asFluid(216); + event.setMaterial(Materials.Propanediol).asFluid(256); + event.setMaterial(Materials.Butanediol).asFluid(286); + //Plastic Related + event.setMaterial(Materials.SiliconeRubber).asFluid(); + //Misc + event.setMaterial(Materials.AceticAcid).asFluid(); + event.setMaterial(Materials.AllylChloride).asFluid(); + event.setMaterial(Materials.Benzaldehyde).asFluid(); + event.setMaterial(Materials.Benzene).asFluid(288); + event.setMaterial(Materials.BenzoylChloride).asFluid(); + event.setMaterial(Materials.Biomass).asFluid(8).flags(GT5RMaterialTags.SEMIFUELS); + event.setMaterial(Materials.BisphenolA).asFluid(); + event.setMaterial(Materials.Chloramine).asFluid(); + event.setMaterial(Materials.Chloroform).asFluid(); + event.setMaterial(Materials.Cumene).asFluid(); + event.setMaterial(Materials.Chlorobenzene).asFluid(); + event.setMaterial(Materials.Dichloroethane).asFluid(); + event.setMaterial(Materials.Dimethyldichlorosilane).asFluid(); + event.setMaterial(Materials.Dimethylhydrazine).asFluid(); + event.setMaterial(Materials.Epichlorohydrin).asFluid(); + event.setMaterial(Materials.Glue).asFluid(); + event.setMaterial(Materials.Glycerol).asFluid(164); + event.setMaterial(Materials.GlycerylTrinitrate).asFluid(); + event.setMaterial(Materials.Honey).asFluid(); // TODO: Only when Forestry's present; + event.setMaterial(Materials.Isoprene).asFluid(); + event.setMaterial(Materials.MethylAcetate).asFluid(); + event.setMaterial(Materials.Naphtha).asFluid(256); + event.setMaterial(Materials.Phenol).asFluid(288); + event.setMaterial(Materials.PolyvinylAcetate).asFluid(); + event.setMaterial(Materials.SquidInk).asFluid(); + event.setMaterial(Materials.Styrene).asFluid(); + event.setMaterial(Materials.SulfuricNaphtha).asFluid(32); + event.setMaterial(Materials.Toluene).asFluid(328); + event.setMaterial(Materials.VinylAcetate).asFluid(); + /** + * Inorganic + **/ + event.setMaterial(Materials.AluminiumFluoride).asFluid(0,1560).flags(MOLTEN, ACID); + event.setMaterial(Materials.Antimatter).asFluid(); + event.setMaterial(Materials.BlueVitriol).asFluid(); + event.setMaterial(Materials.GreenVitriol).asFluid(); + event.setMaterial(Materials.RedVitriol).asFluid(); + event.setMaterial(Materials.PinkVitriol).asFluid(); + event.setMaterial(Materials.CyanVitriol).asFluid(); + event.setMaterial(Materials.WhiteVitriol).asFluid(); + event.setMaterial(Materials.GrayVitriol).asFluid(); + event.setMaterial(Materials.MartianVitriol).asFluid(); + event.setMaterial(Materials.VitriolOfClay).asFluid(); + event.setMaterial(Materials.AquaRegia).asFluid().flags(ACID); + event.setMaterial(Materials.CalciumAcetateSolution).asFluid(); + event.setMaterial(Materials.ChloroplatinicAcid).asFluid().flags(ACID); + event.setMaterial(Materials.Coolant).asFluid(); + event.setMaterial(Materials.Cryolite).asFluid(0, 1285).flags(MOLTEN, ACID); + event.setMaterial(Materials.DistilledWater).asFluid(); + event.setMaterial(Materials.DilutedHydrochloricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.DilutedSulfuricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.DrillingFluid).asFluid(); // TODO: Perhaps for a bedrock drill; + event.setMaterial(Materials.HexafluorosilicicAcid).asFluid().flags(ACID); + event.setMaterial(Materials.HotCoolant).asFluid(0,500); + event.setMaterial(Materials.HeavyWater).asFluid(); + event.setMaterial(Materials.SemiheavyWater).asFluid(); + event.setMaterial(Materials.TritiatedWater).asFluid(); + event.setMaterial(Materials.HotHeavyWater).asFluid(0, 600); + event.setMaterial(Materials.HotSemiheavyWater).asFluid(0, 550); + event.setMaterial(Materials.HotTritiatedWater).asFluid(0, 650); + event.setMaterial(Materials.HotMoltenSodium).asFluid(0, 1100).flags(MOLTEN); + event.setMaterial(Materials.HotMoltenTin).asFluid(0, 2800).flags(MOLTEN); + event.setMaterial(Materials.HotMoltenLithiumChloride).asFluid(0, 1600).flags(MOLTEN); + event.setMaterial(Materials.HydrochloricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.HydrofluoricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.HydrogenFluoride).asGas().flags(ACID).fluidDensity(-111); + event.setMaterial(Materials.HydrogenPeroxide).asFluid(); + event.setMaterial(Materials.HypochlorousAcid).asFluid().flags(ACID); + + event.setMaterial(Materials.Lubricant).asFluid(); + event.setMaterial(Materials.NickelSulfate).asFluid(); + event.setMaterial(Materials.NitricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.PeroxydisulfuricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.PhosphoricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.SaltWater).asFluid(); + event.setMaterial(Materials.SodiumPersulfateSolution).asFluid(); + event.setMaterial(Materials.Steam).asGas(1, 395).fluidDensity(-800); + event.setMaterial(Materials.SuperheatedSteam).asGas(2, 600).fluidDensity(-3000); + event.setMaterial(Materials.SulfuricAcid).asFluid().flags(ACID); + event.setMaterial(Materials.Tar).asFluid(); + event.setMaterial(Materials.ThoriumSalt).asFluid(0, 600).flags(MOLTEN); + event.setMaterial(Materials.TitaniumTetrachloride).asFluid().flags(ACID); + event.setMaterial(Materials.UUAmplifier).asFluid(); + event.setMaterial(Materials.UUMatter).asFluid(); + //Nuclear + /** + *** Gases/Plasmas + **/ + /** + * Organic + **/ + //Alkanes + event.setMaterial(Materials.Methane).asGas(104); + event.setMaterial(Materials.Ethane).asGas(168); + event.setMaterial(Materials.Propane).asGas(232).fluidDensity(-1000); + event.setMaterial(Materials.Butane).asGas(296).fluidDensity(-1000); + //Alkenes + event.setMaterial(Materials.Ethylene).asGas(128).fluidDensity(1000); + event.setMaterial(Materials.Propene).asGas(192); + event.setMaterial(Materials.Butene).asGas(256); + event.setMaterial(Materials.Butadiene).asGas(206); + //Misc + event.setMaterial(Materials.HotCarbonDioxide).asGas().fluidDensity(1000); + event.setMaterial(Materials.CarbonDioxide).asGas().fluidDensity(756); + event.setMaterial(Materials.CarbonMonoxide).asGas(24).fluidDensity(1134); + event.setMaterial(Materials.Chloromethane).asGas(); + event.setMaterial(Materials.Dimethylamine).asGas(); + event.setMaterial(Materials.LPG).asFluid(256); + event.setMaterial(Materials.NaturalGas).asGas(15).fluidDensity(-500); + event.setMaterial(Materials.RefineryGas).asGas(128); + event.setMaterial(Materials.SulfuricGas).asGas(20); + event.setMaterial(Materials.Tetrafluoroethylene).asGas(); + event.setMaterial(Materials.VinylChloride).asGas(); + event.setMaterial(Materials.WoodGas).asGas(24); + /** + * Inorganic + **/ + event.setMaterial(Materials.Air).asGas().fluidDensity(0); + event.setMaterial(Materials.Ammonia).asGas().flags(ACID).fluidDensity(-263); + event.setMaterial(Materials.DinitrogenTetroxide).asGas(); + event.setMaterial(Materials.HydrogenSulfide).asGas(); + event.setMaterial(Materials.NitrogenMonoxide).asGas(); + event.setMaterial(Materials.NitrogenDioxide).asGas(); + event.setMaterial(Materials.NobleGases).asGas(0,790); + event.setMaterial(Materials.SulfurDioxide).asGas().fluidDensity(689); + event.setMaterial(Materials.SulfurTrioxide).asGas(0,300).fluidDensity(517); + /** + ** Fuels + **/ + event.setMaterial(Materials.Creosote).asFluid(8).flags(GT5RMaterialTags.SEMIFUELS); + event.setMaterial(Materials.Oil).asFluid(16).flags(GT5RMaterialTags.SEMIFUELS); + event.setMaterial(Materials.OilHeavy).asFluid(32).flags(GT5RMaterialTags.SEMIFUELS); + event.setMaterial(Materials.OilLight).asFluid(16).flags(GT5RMaterialTags.SEMIFUELS); + event.setMaterial(Materials.BioDiesel).asFluid(192); + event.setMaterial(Materials.Diesel).asFluid(128); + event.setMaterial(Materials.FishOil).asFluid(2).flags(GT5RMaterialTags.SEMIFUELS); + event.setMaterial(Materials.NitroDiesel).asFluid(512); + event.setMaterial(Materials.FuelOil).asFluid(448); + event.setMaterial(Materials.Gasoline).asFluid(384); + event.setMaterial(Materials.Kerosene).asFluid(384); + /** + ** Cracked Stuff + */ + event.setMaterial(Materials.SteamCrackedEthane).asGas(); + event.setMaterial(Materials.SteamCrackedPropane).asGas(); + event.setMaterial(Materials.SteamCrackedButane).asGas(); + event.setMaterial(Materials.SteamCrackedNaphtha).asFluid(); + event.setMaterial(Materials.SteamCrackedRefineryGas).asGas(); + event.setMaterial(Materials.HydroCrackedEthane).asGas(); + event.setMaterial(Materials.HydroCrackedPropane).asGas(); + event.setMaterial(Materials.HydroCrackedButane).asGas(); + event.setMaterial(Materials.HydroCrackedNaphtha).asFluid(); + event.setMaterial(Materials.HydroCrackedRefineryGas).asGas(); + processInto(event); + nuclearIsotopes(event); + toolsAndArmor(event); + workbenches(event); + } + + private static void processInto(GregTechMaterialEvent event){ + /** + *** Solids + **/ + /** + ** Metals + **/ + event.setMaterial(Materials.AnnealedCopper).mats(of(Copper, 1)); + event.setMaterial(Materials.BatteryAlloy).mats(of(Materials.Lead, 4, Materials.Antimony, 1)); + event.setMaterial(Materials.BismuthBronze).mats(of(Materials.Bismuth, 1, Materials.Zinc, 1, Copper, 3)); + event.setMaterial(Materials.BlackBronze).mats(of(Gold, 1, Materials.Silver, 1, Copper, 3)); + event.setMaterial(Materials.BlackSteel).mats(of(Materials.Nickel, 1, Materials.BlackBronze, 1, Materials.Steel, 3)); + event.setMaterial(Materials.BlueSteel).mats(of(Materials.RoseGold, 1, Materials.Brass, 1, Materials.Steel, 2, Materials.BlackSteel, 4)); + event.setMaterial(Materials.Brass).mats(of(Materials.Zinc, 1, Copper, 3)); + event.setMaterial(Materials.Bronze).mats(of(Materials.Tin, 1, Copper, 3)); + event.setMaterial(Materials.CdInAGAlloy).mats(of(Materials.Cadmium, 1, Materials.Indium, 1, Materials.Silver, 1)); + event.setMaterial(Materials.CobaltBrass).mats(of(Materials.Brass, 7, Materials.Aluminium, 1, Materials.Cobalt, 1)); + event.setMaterial(Materials.Cupronickel).mats(of(Copper, 1, Materials.Nickel, 1)); + event.setMaterial(Materials.Electrum).mats(of(Materials.Silver, 1, Gold, 1)); + event.setMaterial(Materials.HSSE).mats(of(Materials.HSSG, 6, Materials.Cobalt, 1, Materials.Manganese, 1, Materials.Silicon, 1)); + event.setMaterial(Materials.HSSG).mats(of(Materials.TungstenSteel, 5, Materials.Chromium, 1, Materials.Molybdenum, 2, Materials.Vanadium, 1)); + event.setMaterial(Materials.HSSS).mats(of(Materials.HSSG, 6, Materials.Iridium, 2, Materials.Osmium, 1)); + event.setMaterial(Materials.Invar).mats(of(Iron, 2, Materials.Nickel, 1)); + event.setMaterial(Materials.IronMagnetic).mats(of(Iron, 1)).elecTicks(52); + event.setMaterial(Materials.Kanthal).mats(of(Iron, 1, Materials.Aluminium, 1, Materials.Chromium, 1)); + event.setMaterial(Materials.Magnalium).mats(of(Materials.Magnesium, 1, Materials.Aluminium, 2)); + event.setMaterial(Materials.NeodymiumMagnetic).mats(of(Materials.Neodymium, 1)).elecTicks(122); + event.setMaterial(Materials.Nichrome).mats(of(Materials.Nickel, 4, Materials.Chromium, 1)); + event.setMaterial(Materials.NickelZincFerrite).mats(of(Materials.Nickel, 1, Materials.Zinc, 1, Iron, 4, Materials.Oxygen, 8)); + event.setMaterial(Materials.NiobiumTitanium).mats(of(Materials.Nickel, 4, Materials.Chromium, 1)); + event.setMaterial(Materials.Osmiridium).mats(of(Materials.Iridium, 3, Materials.Osmium, 1)).elecTicks(608); + event.setMaterial(Materials.RedAlloy).mats(of(Copper, 1, Redstone, 4)); + event.setMaterial(Materials.RedSteel).mats(of(Materials.SterlingSilver, 1, Materials.BismuthBronze, 1, Materials.Steel, 2, Materials.BlackSteel, 4)); + event.setMaterial(Materials.RoseGold).mats(of(Copper, 1, Gold, 4)); + event.setMaterial(Materials.SolderingAlloy).mats(of(Materials.Tin, 9, Materials.Antimony, 1)); + event.setMaterial(Materials.Steel).mats(of(Iron, 50, Materials.Carbon, 1), 50).elecTicks(2600); + event.setMaterial(Materials.SteelMagnetic).mats(of(Materials.Steel, 1)).elecTicks(52); + event.setMaterial(Materials.SterlingSilver).mats(of(Copper, 1, Materials.Silver, 4)); + event.setMaterial(Materials.StainlessSteel).mats(of(Iron, 6, Materials.Chromium, 1, Materials.Manganese, 1, Materials.Nickel, 1)).elecTicks(450); + event.setMaterial(Materials.TinAlloy).mats(of(Materials.Tin, 1, Iron, 1)); + event.setMaterial(Materials.TungstenCarbide).mats(of(Materials.Tungsten, 1, Materials.Carbon, 1)); + event.setMaterial(Materials.TungstenSteel).mats(of(Materials.Steel, 1, Materials.Tungsten, 1)); + event.setMaterial(Materials.Ultimet).mats(of(Materials.Cobalt, 5, Materials.Chromium, 2, Materials.Nickel, 1, Materials.Molybdenum, 1)).elecTicks(504); + event.setMaterial(Materials.VanadiumGallium).mats(of(Materials.Vanadium, 3, Materials.Gallium, 1)); + event.setMaterial(Materials.VanadiumSteel).mats(of(Materials.Vanadium, 1, Materials.Chromium, 1, Materials.Steel, 7)); + event.setMaterial(Materials.WroughtIron).mats(of(Iron, 1)); + event.setMaterial(Materials.YttriumBariumCuprate).mats(of(Materials.Yttrium, 1, Materials.Barium, 2, Copper, 3, Materials.Oxygen, 7)); + /** + ** Dusts + **/ + /** + * Organic + **/ + event.setMaterial(Materials.AntimonyTrioxide).mats(of(Materials.Antimony, 2, Materials.Oxygen, 3)).elecTicks(250); + event.setMaterial(Materials.Clay).mats(of(Materials.Alumina, 5, Materials.SiliconDioxide, 12, Water, 1, Materials.Sodium, 1, Materials.Lithium, 1), 18).elecTicks(182); + event.setMaterial(Materials.CupricOxide).mats(of(Copper, 1, Materials.Oxygen, 1)).elecTicks(72); + event.setMaterial(Materials.DarkAsh).mats(of(Materials.Carbon, 1, Materials.Ash, 1), 1); + event.setMaterial(Materials.Dibenzene).mats(of(Materials.Carbon,12, Materials.Hydrogen,10)); + event.setMaterial(Materials.DibenzoylPeroxide).mats(of(Materials.Carbon,14, Materials.Hydrogen,10, Materials.Oxygen,4)); + event.setMaterial(Materials.Polydimethylsiloxane).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 6, Materials.Oxygen, 1, Materials.Silicon, 1)).elecTicks(80); + event.setMaterial(Materials.RawRubber).mats(of(Materials.Carbon, 5, Materials.Hydrogen, 8)); + event.setMaterial(Materials.RawStyreneButadieneRubber).mats(of(Materials.Styrene, 1, Materials.Butadiene, 3)); + event.setMaterial(Materials.SodaAsh).mats(of(Materials.Sodium, 2, Materials.Carbon, 1, Materials.Oxygen, 3)).elecTicks(96); + event.setMaterial(Wood).mats(of(Materials.Carbon, 1, Materials.Oxygen, 1, Materials.Hydrogen, 1)); + /** + * Inorganic + **/ + event.setMaterial(Materials.AluminiumHydroxide).mats(of(Materials.Aluminium, 1, Materials.Oxygen, 3, Materials.Hydrogen, 3)); + event.setMaterial(Materials.AluminiumTrichloride).mats(of(Materials.Aluminium,1, Materials.Chlorine,3)); + event.setMaterial(Materials.Aluminosilicate).mats(of(Materials.Aluminium, 2, Materials.Silicon, 1, Materials.Oxygen, 5)); + event.setMaterial(Materials.AmmoniumChloride).mats(of(Materials.Nitrogen,1, Materials.Hydrogen,4, Materials.Chlorine,1)); + event.setMaterial(Materials.ArsenicTrioxide).mats(of(Materials.Arsenic, 2, Materials.Oxygen, 3)).elecTicks(180); + event.setMaterial(Materials.Biotite).mats(b -> b.put(Materials.Potassium, 2).put(Materials.Magnesium, 6).put(Materials.Alumina, 15).put(Materials.SiliconDioxide, 18).put(Materials.Fluorine, 4)).elecTicks(440); + event.setMaterial(Materials.BlackGranite).mats(of(Materials.Biotite, 1, Materials.PotassiumFeldspar, 1, Flint, 1)); + event.setMaterial(Materials.BorosilicateGlass).mats(of(Materials.Boron, 1, Materials.Silicon, 7, Materials.Oxygen,14)); + event.setMaterial(Materials.Brick).mats(of(Materials.Aluminium, 4, Materials.Silicon, 3, Materials.Oxygen, 12)); + event.setMaterial(Materials.CalciumChloride).mats(of(Materials.Calcium, 1, Materials.Chlorine, 2)).elecTicks(1024); + event.setMaterial(Materials.CalciumSulfate).mats(of(Materials.Calcium, 1, Materials.Sulfur, 1, Materials.Oxygen, 4)); + event.setMaterial(Materials.CobaltOxide).mats(of(Materials.Cobalt, 1, Materials.Oxygen, 1)).elecTicks(68); + event.setMaterial(Materials.Concrete).mats(of(Stone, 1)).asFluid(); + event.setMaterial(Materials.DialuminiumTrioxide).mats(of(Materials.Aluminium,2, Materials.Oxygen,3)); + event.setMaterial(Materials.Energium).mats(of(Redstone,5, Materials.Ruby,4)); + event.setMaterial(Materials.FerricChloride).mats(of(Iron, 1, Materials.Chlorine, 3)).elecTicks(876); + event.setMaterial(Materials.FerriteMixture).mats(of(Materials.Nickel, 1, Materials.Zinc, 1, Iron, 4)); + event.setMaterial(Materials.Ferrosilite).mats(of(Iron, 1, Materials.Silicon, 1, Materials.Oxygen, 3)).elecTicks(120); + event.setMaterial(Materials.Fireclay).mats(of(Materials.Brick, 1)); + event.setMaterial(Materials.Fluorite).mats(of(Materials.Calcium, 1, Materials.Fluorine, 2)); + event.setMaterial(Materials.IndiumGalliumPhosphide).mats(of(Materials.Indium, 1, Materials.Gallium, 1, Materials.Phosphor, 1)); + event.setMaterial(Materials.IridiumSodiumOxide).mats(of(Materials.Iridium,1, Materials.Sodium,1, Materials.Oxygen,2)); + event.setMaterial(Materials.Komatiite).mats(of(Materials.Olivine, 1, Materials.MagnesiumCarbonate, 2, Flint, 6, Materials.DarkAsh, 3)); + event.setMaterial(Materials.Lapotronium).mats(of(Lapis, 6, Materials.Sapphire, 5, Redstone, 4)); + event.setMaterial(Materials.Limestone).mats(of(Materials.Calcite, 1)); + event.setMaterial(Materials.LithiumChloride).mats(of(Materials.Lithium, 1, Materials.Chlorine, 1)).elecTicks(256); + event.setMaterial(Materials.MagnesiumChloride).mats(of(Materials.Magnesium, 1, Materials.Chlorine, 2)).elecTicks(1024); + event.setMaterial(Materials.Marble).mats(of(Materials.Magnesium, 1, Materials.Calcite, 7)); + event.setMaterial(Materials.Massicot).mats(of(Materials.Lead, 1, Materials.Oxygen, 1)).elecTicks(180); + event.setMaterial(Materials.Obsidian).mats(of(Materials.Magnesium, 1, Iron, 1, Materials.Silicon, 2, Materials.Oxygen, 8)).elecTicks(240); + event.setMaterial(Materials.PhosphorousPentoxide).mats(of(Materials.Phosphor, 4, Materials.Oxygen, 10)).elecTicks(560); + event.setMaterial(Materials.PotassiumBisulfate).mats(of(Materials.Potassium, 1, Materials.Hydrogen, 1, Materials.Sulfur, 1, Materials.Oxygen, 4)).elecTicks(300); + event.setMaterial(Materials.PotassiumFeldspar).mats(of(Materials.Potassium, 2, Materials.Alumina, 5, Materials.SiliconDioxide, 18, Materials.Oxygen, 1)).elecTicks(260); + event.setMaterial(Materials.Powellite).mats(of(Materials.Calcium, 1, Materials.Molybdenum, 1, Materials.Oxygen, 4)); + //event.setMaterial(Pyrochlore).asDust(ORE).addComposition(of(Calcium, 2, Niobium, 2, Oxygen, 7)); + event.setMaterial(Materials.Quartzite).mats(of(Materials.Silicon, 1, Materials.Oxygen, 2)).elecTicks(60); + event.setMaterial(Materials.Quicklime).mats(of(Materials.Calcium, 1, Materials.Oxygen, 1)).elecTicks(56); + event.setMaterial(Materials.ReactionCatalyst).mats(of(Copper,1, Materials.Zinc,1, Materials.Aluminium,2, Materials.Oxygen,4)); + event.setMaterial(Materials.RedGranite).mats(of(Materials.Biotite, 1, Materials.PotassiumFeldspar, 1, Flint, 1)).elecTicks(120); + event.setMaterial(Materials.SiliconDioxide).mats(of(Materials.Silicon, 1, Materials.Oxygen, 2)).elecTicks(240); + event.setMaterial(Materials.Shale).mats(of(Materials.Calcite, 2, Materials.MilkyQuartz, 1, Materials.Clay, 1)); + //event.setMaterial(Slate).mats(of()) + event.setMaterial(Materials.SodiumAluminate).mats(of(Materials.Sodium, 1, Materials.Aluminium, 1, Materials.Oxygen, 2)); + event.setMaterial(Materials.SodiumBisulfate).mats(of(Materials.Sodium, 1, Materials.Hydrogen, 1, Materials.Sulfur, 1, Materials.Oxygen, 4)).elecTicks(600); + event.setMaterial(Materials.SodiumPersulfate).mats(of(Materials.Sodium, 2, Materials.Sulfur, 2, Materials.Oxygen, 8)).elecTicks(432); + event.setMaterial(Materials.SodiumHydroxide).mats(of(Materials.Sodium, 1, Materials.Oxygen, 1, Materials.Hydrogen, 1)).elecTicks(36); + event.setMaterial(Materials.SodiumSulfate).mats(of(Materials.Sodium, 2, Materials.Sulfur, 1, Materials.Oxygen, 4)); + event.setMaterial(Materials.SodiumSulfide).mats(of(Materials.Sodium, 2, Materials.Sulfur, 1)).elecTicks(72); + event.setMaterial(Materials.TungsticAcid).mats(of(Materials.Hydrogen, 2, Materials.Tungsten, 1, Materials.Oxygen, 4)); + event.setMaterial(Materials.TungstenTrioxide).mats(of(Materials.Tungsten, 1, Materials.Oxygen, 3)); + event.setMaterial(Materials.Wollastonite).mats(of(Materials.Calcium, 1, Materials.SiliconDioxide, 3, Materials.Oxygen, 1)).elecTicks(1460); + //Nuclear + + /** + ** Ores + **/ + event.setMaterial(Materials.Almandine).mats(of(Materials.Alumina, 5, Iron, 3, Materials.SiliconDioxide, 9, Materials.Oxygen, 3)).elecTicks(480); + event.setMaterial(Materials.Alumina).mats(of(Materials.Aluminium, 2, Materials.Oxygen, 3)).elecTicks(480); + event.setMaterial(Materials.Andradite).mats(of(Materials.Calcium, 3, Iron, 2, Materials.Silicon, 3, Materials.Oxygen, 12)).elecTicks(480); + event.setMaterial(Materials.Hematite).mats(of(Iron, 2, Materials.Oxygen, 3)).elecTicks(150); + event.setMaterial(Materials.Bastnasite).mats(of(Materials.Cerium, 1, Materials.Carbon, 1, Materials.Fluorine, 1, Materials.Oxygen, 3)).elecTicks(192); + event.setMaterial(Materials.Barite).mats(of(Materials.Barium, 1, Materials.Sulfur, 1, Materials.Oxygen, 4)).elecTicks(204); + event.setMaterial(Materials.Bentonite).mats(b -> b.put(Materials.Sodium, 1).put(Materials.Magnesium, 6).put(Materials.Silicon, 12).put(Materials.Hydrogen, 6).put(Water, 5).put(Materials.Oxygen, 36)).elecTicks(480); // TODO: Ore Gen + event.setMaterial(Materials.BrownLimonite).mats(of(Iron, 1, Materials.Hydrogen, 1, Materials.Oxygen, 2)); + event.setMaterial(Materials.Calcite).mats(of(Materials.Calcium, 1, Materials.Carbon, 1, Materials.Oxygen, 3)).elecTicks(100); + event.setMaterial(Materials.Cassiterite).mats(of(Materials.Tin, 1, Materials.Oxygen, 2), 1).elecTicks(132); + event.setMaterial(Materials.Chalcopyrite).mats(of(Copper, 1, Iron, 1, Materials.Sulfur, 2)).elecTicks(168); + event.setMaterial(Materials.Cinnabar).mats(of(Materials.Mercury, 1, Materials.Sulfur, 1)); + event.setMaterial(Materials.Chromite).mats(of(Iron, 1, Materials.Chromium, 2, Materials.Oxygen, 4)).elecTicks(210); + event.setMaterial(Materials.Cobaltite).mats(of(Materials.Cobalt, 1, Materials.Arsenic, 1, Materials.Sulfur, 1)).elecTicks(150); + event.setMaterial(Materials.Sheldonite).mats(of(Materials.Platinum, 3, Materials.Nickel, 1, Materials.Sulfur, 1, Materials.Palladium, 1)); + event.setMaterial(Materials.Galena).mats(of(Materials.Lead, 3, Materials.Silver, 3, Materials.Sulfur, 2)).elecTicks(832); + event.setMaterial(Materials.Garnierite).mats(of(Materials.Nickel, 1, Materials.Oxygen, 1), 1).elecTicks(72); + event.setMaterial(Materials.Graphite).mats(of(Materials.Carbon, 4), 1).elecTicks(100); + event.setMaterial(Materials.Glauconite).mats(of(Materials.Alumina, 10, Materials.Potassium, 1, Materials.Magnesium, 2, Water, 3, Materials.Oxygen, 7)).elecTicks(378); // TODO: Ore Gen; + event.setMaterial(Materials.Grossular).mats(of(Materials.Alumina, 5, Materials.Calcium, 3, Materials.SiliconDioxide, 9, Materials.Oxygen, 3)).elecTicks(440); + event.setMaterial(Materials.Ilmenite).mats(of(Iron, 1, Materials.Titanium, 1, Materials.Oxygen, 3)); + event.setMaterial(Materials.Lepidolite).mats(of(Materials.Alumina, 10, Materials.Potassium, 1, Materials.Lithium, 3, Materials.Fluorine, 2, Materials.Oxygen, 6)).elecTicks(320); // TODO: Ore Gen; + event.setMaterial(Materials.Rutile).mats(of(Materials.Cobalt, 1, Materials.Arsenic, 1, Materials.Sulfur, 1)); + event.setMaterial(Materials.Magnesite).mats(of(Materials.Magnesium, 1, Materials.Carbon, 1, Materials.Oxygen, 3)).elecTicks(80); + event.setMaterial(Materials.Magnetite).mats(of(Iron, 3, Materials.Oxygen, 4)).elecTicks(210); + event.setMaterial(Materials.Malachite).mats(of(Copper, 2, Materials.Carbon, 1, Materials.Hydrogen, 2, Materials.Oxygen, 5)).elecTicks(200); + event.setMaterial(Materials.Molybdenite).mats(of(Materials.Molybdenum, 1, Materials.Sulfur, 2)).elecTicks(144); + event.setMaterial(Materials.Pentlandite).mats(of(Materials.Nickel, 9, Materials.Sulfur, 8)).elecTicks(748); + event.setMaterial(Materials.Phosphate).mats(of(Materials.Phosphor, 1, Materials.Oxygen, 4)).elecTicks(360); + event.setMaterial(Materials.Pitchblende).mats(of(Materials.Uraninite, 3, Materials.Thorium, 1, Materials.Lead, 1)); + event.setMaterial(Materials.Pyrite).mats(of(Iron, 1, Materials.Sulfur, 2)).elecTicks(114); + event.setMaterial(Materials.Pyrolusite).mats(of(Materials.Manganese, 1, Materials.Oxygen, 2)).elecTicks(78); + event.setMaterial(Materials.Pyrope).mats(of(Materials.Alumina, 5, Materials.Magnesium, 3, Materials.SiliconDioxide, 9, Materials.Oxygen, 3)).elecTicks(400); + event.setMaterial(Materials.Saltpeter).mats(of(Materials.Potassium, 1, Materials.Nitrogen, 1, Materials.Oxygen, 3)).elecTicks(100); + event.setMaterial(Materials.Scheelite).mats(of(Materials.Tungsten, 1, Materials.Calcium, 2, Materials.Oxygen, 4)).elecTicks(120); + event.setMaterial(Materials.Soapstone).mats(of(Materials.Magnesium, 3, Materials.Silicon, 4, Materials.Hydrogen, 2, Materials.Oxygen, 12)).elecTicks(378); // TODO: Ore Gen; + event.setMaterial(Materials.Spodumene).mats(of(Materials.Lithium, 2, Materials.Alumina, 5, Materials.SiliconDioxide, 12, Materials.Oxygen, 1)).elecTicks(180); + event.setMaterial(Materials.Sperrylite).mats(of(Materials.Platinum, 1, Materials.Arsenic, 2)).elecTicks(1226); + event.setMaterial(Materials.Spessartine).mats(of(Materials.Alumina, 5, Materials.Manganese, 3, Materials.SiliconDioxide, 9, Materials.Oxygen, 3)).elecTicks(440); + event.setMaterial(Materials.Sphalerite).mats(of(Materials.Zinc, 1, Materials.Sulfur, 1)).elecTicks(92); + event.setMaterial(Materials.Stibnite).mats(of(Materials.Antimony, 2, Materials.Sulfur, 3)); + event.setMaterial(Materials.Tantalite).mats(of(Materials.Manganese, 1, Materials.Tantalum, 2, Materials.Oxygen, 6)).elecTicks(432); + event.setMaterial(Materials.Talc).mats(of(Materials.Magnesium, 3, Materials.Silicon, 4, Materials.Hydrogen, 2, Materials.Oxygen, 12)).elecTicks(378); + event.setMaterial(Materials.Tetrahedrite).mats(of(Copper, 3, Materials.Antimony, 1, Materials.Sulfur, 3, Iron, 1)); + event.setMaterial(Materials.Tungstate).mats(of(Materials.Tungsten, 1, Materials.Lithium, 2, Materials.Oxygen, 4)).elecTicks(120); + event.setMaterial(Materials.Uraninite).mats(of(Materials.Uranium, 1, Materials.Oxygen, 2)); + event.setMaterial(Materials.Uvarovite).mats(of(Materials.Calcium, 3, Materials.Chromium, 2, Materials.Silicon, 3, Materials.Oxygen, 12)).elecTicks(480); + event.setMaterial(Materials.VanadiumMagnetite).mats(of(Materials.Magnetite, 1, Materials.Vanadium, 1)); + event.setMaterial(Materials.Wulfenite).mats(of(Materials.Lead, 1, Materials.Molybdenum, 1, Materials.Oxygen, 4)); + event.setMaterial(Materials.YellowLimonite).mats(of(Iron, 1, Materials.Hydrogen, 1, Materials.Oxygen, 2)); + event.setMaterial(Materials.Zircon).mats(of(Materials.Zirconium, 1, Materials.SiliconDioxide, 3, Materials.Oxygen, 2)).elecTicks(1740); + /** + ** Ore Stones + **/ + event.setMaterial(Materials.Bauxite).mats(of(Materials.Rutile, 2, Materials.Aluminium, 16, Materials.Hydrogen, 10, Materials.Oxygen, 11)); + event.setMaterial(Materials.Lignite).mats(of(Materials.Carbon, 3, Water, 1)).elecTicks(40); + event.setMaterial(Materials.RockSalt).mats(of(Materials.Potassium, 1, Materials.Chlorine, 1)).elecTicks(72); + event.setMaterial(Materials.Salt).mats(of(Materials.Sodium, 1, Materials.Chlorine, 1)).elecTicks(320); + /** + ** Gems + **/ + /** + * Regular + **/ + event.setMaterial(Materials.Amethyst).mats(of(Materials.SiliconDioxide, 4, Iron, 1)).elecTicks(130); + event.setMaterial(Materials.Sapphire).mats(of(Materials.Alumina, 5, Iron, 1)).elecTicks(100); + event.setMaterial(Materials.BlueTopaz).mats(of(Materials.Alumina, 5, Materials.SiliconDioxide, 3, Materials.Fluorine, 2, Water, 3)).elecTicks(208); + event.setMaterial(Materials.Glass).mats(of(Materials.SiliconDioxide, 1)); + event.setMaterial(Materials.GreenSapphire).mats(of(Materials.Alumina, 5, Materials.Magnesium, 1)).elecTicks(100); + event.setMaterial(Materials.Lazurite).mats(of(Materials.Alumina, 3, Materials.SiliconDioxide, 3, Materials.Calcium, 4, Materials.Sodium, 4)).elecTicks(392); + event.setMaterial(Materials.Olivine).mats(of(Materials.Magnesium, 2, Iron, 1, Materials.SiliconDioxide, 2)).elecTicks(140); + event.setMaterial(Materials.Opal).mats(of(Materials.SiliconDioxide, 1)).elecTicks(20); + event.setMaterial(Materials.TricalciumPhosphate).mats(of(Materials.Calcium, 3, Materials.Phosphate, 2)); + event.setMaterial(Materials.MilkyQuartz).mats(of(Materials.Silicon, 1, Materials.Oxygen, 2)).elecTicks(60); + event.setMaterial(Materials.RedGarnet).mats(of(Materials.Pyrope, 3, Materials.Almandine, 5, Materials.Spessartine, 8)); + event.setMaterial(Materials.Ruby).mats(of(Materials.Chromium, 1, Materials.Alumina, 5)).elecTicks(144); + event.setMaterial(Materials.Sodalite).mats(of(Materials.Alumina, 3, Materials.SiliconDioxide, 3, Materials.Sodium, 4, Materials.Chlorine, 1)).elecTicks(264); + event.setMaterial(Materials.Tanzanite).mats(of(Materials.Alumina, 15, Materials.Calcium, 4, Materials.SiliconDioxide, 18, Water, 3, Materials.Oxygen, 4)).elecTicks(440); + event.setMaterial(Materials.Topaz).mats(of(Materials.Alumina, 5, Materials.SiliconDioxide, 3, Materials.Fluorine, 2, Water, 3)).elecTicks(208); + event.setMaterial(Materials.YellowGarnet).mats(of(Materials.Andradite, 5, Materials.Grossular, 8, Materials.Uvarovite, 3)); + /** + * Basic + **/ + event.setMaterial(Charcoal).mats(of(Materials.Carbon, 1)).elecTicks(12); + event.setMaterial(Materials.CoalCoke).mats(of(Materials.Carbon, 2)).elecTicks(12); + event.setMaterial(Materials.Apatite).mats(of(Materials.Calcium, 5, Materials.Phosphate, 3, Materials.Chlorine, 1)).elecTicks(288); + event.setMaterial(Materials.Monazite).mats(of(Materials.RareEarth, 1, Materials.Phosphate, 1)).elecTicks(104); + /** + ** Plastic Related + **/ + event.setMaterial(Materials.EpoxyResin).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 4, Materials.Oxygen, 1)); + event.setMaterial(Materials.FiberReinforcedEpoxyResin).mats(of(Materials.EpoxyResin, 1)); + event.setMaterial(Materials.Plastic).mats(of(Materials.Carbon, 1, Materials.Hydrogen, 2)); + //event.setMaterial(Polystyrene).mats(of(Carbon, 8, Hydrogen, 8)); + event.setMaterial(Materials.Polytetrafluoroethylene).mats(of(Materials.Carbon, 2, Materials.Fluorine, 4)); + event.setMaterial(Materials.PolyvinylChloride).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 3, Materials.Chlorine, 1)); + event.setMaterial(Materials.Rubber).mats(of(Materials.Carbon, 5, Materials.Hydrogen, 8)); + event.setMaterial(Materials.SiliconeRubber).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 6, Materials.Oxygen, 1, Materials.Silicon, 1)); + event.setMaterial(Materials.StyreneButadieneRubber).mats(of(Materials.Styrene, 1, Materials.Butadiene, 3)); + /** + ** Misc + **/ + event.setMaterial(Materials.GalliumArsenide).mats(of(Materials.Arsenic, 1, Materials.Gallium, 1)); + /** + *** Fluids + **/ + /** + * Organic + **/ + event.setMaterial(Materials.Acetone).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 6, Materials.Oxygen, 1)).elecTicks(240); + event.setMaterial(Materials.CharcoalByproducts).mats(of(Materials.WoodTar,1, Materials.WoodGas,1, Materials.WoodVinegar,2)); + event.setMaterial(Materials.WoodTar).mats(of(Materials.Creosote,4, Materials.Phenol,1, Materials.Benzene,2, Materials.Toluene,1)); + //Alkanoles + event.setMaterial(Materials.Methanol).mats(of(Materials.Carbon, 1, Materials.Hydrogen, 4, Materials.Oxygen, 1)).elecTicks(144); + event.setMaterial(Materials.Ethanol).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 6, Materials.Oxygen, 1)).elecTicks(144); + event.setMaterial(Materials.Propanol).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 8, Materials.Oxygen, 1)); + event.setMaterial(Materials.Butanol).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 10, Materials.Oxygen, 1)); + event.setMaterial(Materials.Heptanol).mats(of(Materials.Carbon, 7, Materials.Hydrogen, 16, Materials.Oxygen, 1)); + //Alkenoles + event.setMaterial(Materials.Ethenol).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 4, Materials.Oxygen, 1)); + event.setMaterial(Materials.Propenol).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 6, Materials.Oxygen, 1)); + event.setMaterial(Materials.Butenol).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 8, Materials.Oxygen, 1)); + //Alkanedioles + event.setMaterial(Materials.Ethanediol).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 6, Materials.Oxygen, 2)); + event.setMaterial(Materials.Propanediol).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 8, Materials.Oxygen, 2)); + event.setMaterial(Materials.Butanediol).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 10, Materials.Oxygen, 2)); + //Misc + event.setMaterial(Materials.AceticAcid).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 4, Materials.Oxygen, 2)).elecTicks(128); + event.setMaterial(Materials.AllylChloride).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 5, Materials.Chlorine, 1)).elecTicks(288); + event.setMaterial(Materials.Benzaldehyde).mats(of(Materials.Carbon,7, Materials.Hydrogen,6, Materials.Oxygen,1)); + event.setMaterial(Materials.Benzene).mats(of(Materials.Carbon, 6, Materials.Hydrogen, 6)).elecTicks(48); + event.setMaterial(Materials.BenzoylChloride).mats(of(Materials.Carbon,7, Materials.Hydrogen,5, Materials.Chlorine,1, Materials.Oxygen,1)); + event.setMaterial(Materials.BisphenolA).mats(of(Materials.Carbon, 15, Materials.Hydrogen, 16, Materials.Oxygen, 2)); + event.setMaterial(Materials.Chloramine).mats(of(Materials.Nitrogen, 1, Materials.Hydrogen, 2, Materials.Chlorine, 1)).elecTicks(192); + event.setMaterial(Materials.Chloroform).mats(of(Materials.Carbon, 1, Materials.Hydrogen, 1, Materials.Chlorine, 3)).elecTicks(440); + event.setMaterial(Materials.Cumene).mats(of(Materials.Carbon, 9, Materials.Hydrogen, 12)); + event.setMaterial(Materials.Chlorobenzene).mats(of(Materials.Carbon, 6, Materials.Hydrogen, 5, Materials.Chlorine, 1)).elecTicks(384); + event.setMaterial(Materials.Dichloroethane).mats(of(Materials.Carbon,2, Materials.Hydrogen,4, Materials.Chlorine,2)); + event.setMaterial(Materials.Dimethyldichlorosilane).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 6, Materials.Chlorine, 2, Materials.Silicon, 1)).elecTicks(528); + event.setMaterial(Materials.Dimethylhydrazine).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 8, Materials.Nitrogen, 2)); + event.setMaterial(Materials.Epichlorohydrin).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 5, Materials.Chlorine, 1, Materials.Oxygen, 1)).elecTicks(320); + event.setMaterial(Materials.Glycerol).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 8, Materials.Oxygen, 3)).elecTicks(336); + event.setMaterial(Materials.GlycerylTrinitrate).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 5, Materials.Nitrogen, 3, Materials.Oxygen, 9)).elecTicks(800); + event.setMaterial(Materials.Isoprene).mats(of(Materials.Carbon, 8, Materials.Hydrogen, 8)).elecTicks(208); + event.setMaterial(Materials.MethylAcetate).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 6, Materials.Oxygen, 2)).elecTicks(264); + event.setMaterial(Materials.Naphtha).mats(of(Materials.Carbon,8, Materials.Hydrogen,16)); + event.setMaterial(Materials.Phenol).mats(of(Materials.Carbon, 6, Materials.Hydrogen, 6, Materials.Oxygen, 1)).elecTicks(312); + event.setMaterial(Materials.PolyvinylAcetate).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 6, Materials.Oxygen, 2)); + event.setMaterial(Materials.Styrene).mats(of(Materials.Carbon, 8, Materials.Hydrogen, 8)).elecTicks(48); + event.setMaterial(Materials.SulfuricNaphtha).mats(of(Materials.Naphtha, 1, Materials.HydrogenSulfide,1)); + event.setMaterial(Materials.Toluene).mats(of(Materials.Carbon, 7, Materials.Hydrogen, 8)).elecTicks(360); + event.setMaterial(Materials.VinylAcetate).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 6, Materials.Oxygen, 2)).elecTicks(144); + /** + * Inorganic + **/ + event.setMaterial(Materials.BlueVitriol).mats(of(Copper,1, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.GreenVitriol).mats(of(Iron,1, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.RedVitriol).mats(of(Materials.Cobalt,1, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.PinkVitriol).mats(of(Materials.Magnesium,1, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.CyanVitriol).mats(of(Materials.Nickel,1, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.WhiteVitriol).mats(of(Materials.Zinc,1, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.GrayVitriol).mats(of(Materials.Manganese,1, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.VitriolOfClay).mats(of(Materials.Alumina, 1, Materials.Sulfur, 3, Materials.Oxygen, 8)); + event.setMaterial(Materials.CalciumAcetateSolution).mats(of(Materials.Calcium, 1, Materials.Carbon, 2, Materials.Oxygen, 4, Materials.Hydrogen, 6)).elecTicks(520); + event.setMaterial(Materials.DistilledWater).mats(of(Materials.Hydrogen,2, Materials.Oxygen, 1)).elecTicks(2000); + event.setMaterial(Materials.DilutedHydrochloricAcid).mats(of(Materials.Hydrogen, 1, Materials.Chlorine, 1)); + event.setMaterial(Materials.DilutedSulfuricAcid).mats(of(Materials.Hydrogen,2, Materials.Sulfur,1, Materials.Oxygen,4)); + event.setMaterial(Materials.HeavyWater).mats(of(Materials.Deuterium, 2, Materials.Oxygen, 1)).elecTicks(2000); + event.setMaterial(Materials.SemiheavyWater).mats(of(Materials.Hydrogen, 1, Materials.Deuterium, 1, Materials.Oxygen, 1)).elecTicks(2000); + event.setMaterial(Materials.TritiatedWater).mats(of(Materials.Tritanium, 2, Materials.Oxygen, 1)).elecTicks(2000); + event.setMaterial(Materials.HotHeavyWater).mats(of(Materials.Deuterium, 2, Materials.Oxygen, 1)); + event.setMaterial(Materials.HotSemiheavyWater).mats(of(Materials.Hydrogen, 1, Materials.Deuterium, 1, Materials.Oxygen, 1)); + event.setMaterial(Materials.HotTritiatedWater).mats(of(Materials.Tritanium, 2, Materials.Oxygen, 1)); + event.setMaterial(Materials.HotMoltenLithiumChloride).mats(of(Materials.LithiumChloride, 1)); + event.setMaterial(Materials.HydrochloricAcid).mats(of(Materials.Hydrogen, 1, Materials.Chlorine, 1)).elecTicks(720); + event.setMaterial(Materials.HydrofluoricAcid).mats(of(Materials.Hydrogen, 1, Materials.Fluorine, 1)).elecTicks(80); + event.setMaterial(Materials.HydrogenFluoride).mats(of(Materials.Hydrogen, 1, Materials.Fluorine, 1)).elecTicks(80); + event.setMaterial(Materials.HydrogenPeroxide).mats(of(Materials.Hydrogen,2, Materials.Oxygen,2)); + event.setMaterial(Materials.HypochlorousAcid).mats(of(Materials.Hydrogen, 1, Materials.Chlorine, 1, Materials.Oxygen, 1)).elecTicks(192); + + event.setMaterial(Materials.NickelSulfate).mats(of(Materials.Nickel,1, Materials.Sulfur,1, Materials.Oxygen,4)).elecTicks(900); + event.setMaterial(Materials.NitricAcid).mats(of(Materials.Hydrogen, 1, Materials.Nitrogen, 1, Materials.Oxygen, 3)).elecTicks(240); + event.setMaterial(Materials.PeroxydisulfuricAcid).mats(of(Materials.Sulfur,2, Materials.Hydrogen,2, Materials.Oxygen,8)); + event.setMaterial(Materials.PhosphoricAcid).mats(of(Materials.Hydrogen, 3, Materials.Phosphor, 1, Materials.Oxygen, 4)).elecTicks(392); + event.setMaterial(Materials.SaltWater).mats(of(Materials.Hydrogen,1, Materials.SodiumHydroxide,3, Materials.Chlorine,1), 8).elecTicks(720); + event.setMaterial(Materials.Steam).mats(of(Water,1)); + event.setMaterial(Materials.SuperheatedSteam).mats(of(Materials.Steam, 1)); + event.setMaterial(Materials.SulfuricAcid).mats(of(Materials.Hydrogen, 2, Materials.Sulfur, 1, Materials.Oxygen, 4)).elecTicks(392); + event.setMaterial(Materials.SulfurTrioxide).mats(of(Materials.Sulfur, 1, Materials.Oxygen, 3)).elecTicks(320); + event.setMaterial(Materials.SulfurDioxide).mats(of(Materials.Sulfur, 1, Materials.Oxygen, 2)).elecTicks(300); + event.setMaterial(Materials.TitaniumTetrachloride).mats(of(Materials.Titanium, 1, Materials.Chlorine, 4)); + /** + *** Gases/Plasmas + **/ + /** + * Organic + **/ + //Alkanes + event.setMaterial(Materials.Methane).mats(of(Materials.Carbon, 1, Materials.Hydrogen, 4)).elecTicks(80); + event.setMaterial(Materials.Ethane).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 6)).elecTicks(64); + event.setMaterial(Materials.Propane).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 6)).elecTicks(196); + event.setMaterial(Materials.Butane).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 10)).elecTicks(112); + //Alkenes + event.setMaterial(Materials.Ethylene).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 4)).elecTicks(48); + event.setMaterial(Materials.Propene).mats(of(Materials.Carbon, 3, Materials.Hydrogen, 6)).elecTicks(48); + event.setMaterial(Materials.Butene).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 8)).elecTicks(48); + event.setMaterial(Materials.Butadiene).mats(of(Materials.Carbon, 4, Materials.Hydrogen, 6)).elecTicks(120); + //Misc + event.setMaterial(Materials.CarbonDioxide).mats(of(Materials.Carbon, 1, Materials.Oxygen, 2)).elecTicks(300); + event.setMaterial(Materials.CarbonMonoxide).mats(of(Materials.Carbon, 1, Materials.Oxygen, 1)).elecTicks(112); + event.setMaterial(Materials.Chloromethane).mats(of(Materials.Carbon, 1, Materials.Hydrogen, 3, Materials.Chlorine, 1)).elecTicks(200); + event.setMaterial(Materials.Dimethylamine).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 7, Materials.Nitrogen, 1)).elecTicks(160); + event.setMaterial(Materials.NaturalGas).mats(of(Materials.Methane,4, Materials.Ethane,2, Materials.Propane,2, Materials.Butane,1)); + event.setMaterial(Materials.RefineryGas).asGas(128); + event.setMaterial(Materials.SulfuricGas).mats(of(Materials.NaturalGas,1, Materials.Sulfur,1)); + event.setMaterial(Materials.Tetrafluoroethylene).mats(of(Materials.Carbon, 2, Materials.Fluorine, 4)); + event.setMaterial(Materials.VinylChloride).mats(of(Materials.Carbon, 2, Materials.Hydrogen, 3, Materials.Chlorine, 1)).elecTicks(240); + event.setMaterial(Materials.WoodGas).mats(of(Materials.CarbonDioxide,8, Materials.CarbonMonoxide,4, Materials.Methane,2, Materials.Ethylene,1, Materials.Hydrogen,1)); + /** + * Inorganic + **/ + //event.setMaterial(Air).mats(of(Nitrogen, 40, Oxygen, 11, Argon, 1, NobleGases, 1 )); + event.setMaterial(Materials.Ammonia).mats(of(Materials.Nitrogen, 1, Materials.Hydrogen, 3)).elecTicks(64); + event.setMaterial(Materials.DinitrogenTetroxide).mats(of(Materials.Nitrogen, 2, Materials.Oxygen, 4)).elecTicks(168); + event.setMaterial(Materials.HydrogenSulfide).mats(of(Materials.Hydrogen, 2, Materials.Sulfur, 1)); + event.setMaterial(Materials.NitrogenMonoxide).mats(of(Materials.Nitrogen, 1, Materials.Oxygen, 1)).elecTicks(112); + event.setMaterial(Materials.NitrogenDioxide).mats(of(Materials.Nitrogen, 1, Materials.Oxygen, 2)).elecTicks(168); + event.setMaterial(Materials.SulfurDioxide).mats(of(Materials.Sulfur, 1, Materials.Oxygen, 2)); + event.setMaterial(Materials.SulfurTrioxide).mats(of(Materials.Sulfur, 1, Materials.Oxygen, 3)); + /** + ** Cracked Stuff + */ + event.setMaterial(Materials.SteamCrackedEthane).mats(of(Materials.Ethane,1, Materials.Steam,1)); + event.setMaterial(Materials.SteamCrackedPropane).mats(of(Materials.Propane,1, Materials.Steam,1)); + event.setMaterial(Materials.SteamCrackedButane).mats(of(Materials.Butane,1, Materials.Steam,1)); + event.setMaterial(Materials.SteamCrackedNaphtha).mats(of(Materials.Naphtha,1, Materials.Steam,1)); + event.setMaterial(Materials.SteamCrackedRefineryGas).mats(of(Materials.RefineryGas,1, Materials.Steam,1)); + event.setMaterial(Materials.HydroCrackedEthane).mats(of(Materials.Ethane,1, Materials.Hydrogen,1)); + event.setMaterial(Materials.HydroCrackedPropane).mats(of(Materials.Propane,1, Materials.Hydrogen,1)); + event.setMaterial(Materials.HydroCrackedButane).mats(of(Materials.Butane,1, Materials.Hydrogen,2)); + event.setMaterial(Materials.HydroCrackedNaphtha).mats(of(Materials.Naphtha,1, Materials.Hydrogen,2)); + event.setMaterial(Materials.HydroCrackedRefineryGas).mats(of(Materials.RefineryGas,1, Materials.Hydrogen,2)); + } + + private static void toolsAndArmor(GregTechMaterialEvent event){ + /** + ** Periodic Elements + */ + event.setMaterial(Materials.Beryllium).tool().toolDamage(2).toolSpeed(14).toolDurability(64).toolQuality(2).build(); + event.setMaterial(Materials.Titanium).tool().toolDamage(3).toolSpeed(8).toolDurability(2560).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build(); + event.setMaterial(Materials.Chromium).tool().toolDamage(3).toolSpeed(11).toolDurability(256).toolQuality(3).build(); + event.setMaterial(Materials.Manganese).tool().toolDamage(2).toolSpeed(7).toolDurability(256).toolQuality(2).build(); + event.setMaterial(Materials.Cobalt).tool().toolDamage(3).toolSpeed(5).toolDurability(256).toolQuality(3).build(); + event.setMaterial(Materials.Nickel).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 2)).build().harvestLevel(2); + event.setMaterial(Materials.Zirconium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); + event.setMaterial(Materials.Molybdenum).tool().toolDamage(2).toolSpeed(7).toolDurability(512).toolQuality(2).build().harvestLevel(2); + event.setMaterial(Materials.Technetium).tool().toolDamage(1).toolSpeed(10).toolDurability(1280).toolQuality(1).build(); + event.setMaterial(Materials.Palladium).tool().toolDamage(2).toolSpeed(8).toolDurability(512).toolQuality(2).build().harvestLevel(2); + event.setMaterial(Materials.Neodymium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); + event.setMaterial(Materials.Tungsten).tool().toolDamage(3).toolSpeed(8).toolDurability(5120).toolQuality(3).build(); // TODO: stats like non burnable + event.setMaterial(Materials.Osmium).tool().toolDamage(4).toolSpeed(16).toolDurability(1280).toolQuality(4).build(); + event.setMaterial(Materials.Iridium).tool().toolDamage(4).toolSpeed(6).toolDurability(5120).toolQuality(4).build(); + event.setMaterial(Materials.Platinum).tool().toolDamage(2).toolSpeed(15).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 5)).build().harvestLevel(2); + event.setMaterial(Materials.Thorium).tool().toolDamage(2).toolSpeed(6).toolDurability(512).toolQuality(2).build().harvestLevel(2); + event.setMaterial(Materials.Uranium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); + event.setMaterial(Materials.Plutonium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); // TODO: Enchantment: Radioactivity; + + /** + ** Metals + **/ + event.setMaterial(Materials.BismuthBronze).tool().toolDamage(2).toolSpeed(8).toolDurability(512).toolQuality(2).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 4)).build() + .addArmor(new int[]{2, 6, 5, 2}, 0.0f, 0.0f, 16); + event.setMaterial(Materials.BlackBronze).tool().toolDamage(2).toolSpeed(12).toolDurability(512).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 2)).build() + .addArmor(new int[]{2, 6, 5, 2}, 0.0f, 0.0f, 16); + event.setMaterial(Materials.BlackSteel).tool().toolDamage(2).toolSpeed(6.5f).toolDurability(768).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build() + .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 32, of(Enchantments.ALL_DAMAGE_PROTECTION, 2)); + event.setMaterial(Materials.BlueSteel).tool().toolDamage(2).toolSpeed(7).toolDurability(896).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build() + .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 37, of(Enchantments.ALL_DAMAGE_PROTECTION, 3)); + event.setMaterial(Materials.Bronze).tool().toolDamage(2).toolSpeed(6).toolDurability(448).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 1)).build() + .addArmor(new int[]{2, 6, 5, 2}, 0.0F, 0.0F, 12); + event.setMaterial(Materials.CobaltBrass).tool().toolDamage(2).toolSpeed(8).toolDurability(256).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 2)).build(); + //event.setMaterial(Duranium).addHandleStat(620, -1.0F, of(Enchantments.SILK_TOUCH, 1)) + //.addTools(6.5F, 16.0F, 5120, 5); + event.setMaterial(Materials.Electrum).tool().toolDamage(2).toolSpeed(12).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 3)).build(); + event.setMaterial(Materials.EnrichedNaquadah).tool().toolDamage(4).toolSpeed(6).toolDurability(1280).toolQuality(4).build(); + event.setMaterial(Materials.HSSE).tool().toolDamage(4).toolSpeed(10).toolDurability(5120).toolQuality(4).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); + event.setMaterial(Materials.HSSG).tool().toolDamage(3).toolSpeed(10).toolDurability(4000).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); + event.setMaterial(Materials.HSSS).tool().toolDamage(4).toolSpeed(14).toolDurability(3000).toolQuality(4).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); + event.setMaterial(Materials.Invar).tool().toolDamage(2).toolSpeed(6).toolDurability(256).toolQuality(3).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 3)).build() + .addArmor(new int[]{2, 6, 5, 2}, 0.0F, 0.0F, 15, of(Enchantments.FIRE_PROTECTION, 1)); + event.setMaterial(Materials.IronMagnetic).tool(Iron).toolEnchantments(of(Enchantments.SHARPNESS, 1)).build(); + event.setMaterial(Materials.Kanthal).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).build(); + event.setMaterial(Materials.Neutronium).tool().toolDamage(9).toolSpeed(24).toolDurability(655360).toolQuality(6).build(); + event.setMaterial(Materials.Naquadah).tool().toolDamage(4).toolSpeed(6).toolDurability(1280).toolQuality(4).build(); + event.setMaterial(Materials.NaquadahAlloy).tool().toolDamage(4.5f).toolSpeed(8).toolDurability(5120).toolQuality(4).build(); + event.setMaterial(Materials.Nichrome).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 2)).build(); + event.setMaterial(Materials.NickelZincFerrite).tool().toolDamage(0).toolSpeed(3).toolDurability(32).toolQuality(1).build(); + event.setMaterial(Materials.Osmiridium).tool().toolDamage(4).toolSpeed(11).toolDurability(3840).toolQuality(4).build(); + event.setMaterial(Materials.RedSteel).tool().toolDamage(2).toolSpeed(7.5f).toolDurability(1024).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build() + .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 42, of(Enchantments.ALL_DAMAGE_PROTECTION, 3)); + event.setMaterial(Materials.RoseGold).tool().toolDamage(2).toolSpeed(14).toolDurability(128).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 4)).build(); + event.setMaterial(Materials.Steel).tool(Iron).toolDurability(512).toolEnchantments(of(Enchantments.SHARPNESS, 2)).build() + .addArmor(new int[]{2, 7, 6, 2}, 1.0F, 0.0F, 21, of(Enchantments.ALL_DAMAGE_PROTECTION, 1)); + event.setMaterial(Materials.SteelMagnetic).tool(Materials.Steel).toolEnchantments(of(Enchantments.SHARPNESS, 2)).build(); + event.setMaterial(Materials.SterlingSilver).tool().toolDamage(2).toolSpeed(13).toolDurability(128).toolQuality(2).build(); + event.setMaterial(Materials.StainlessSteel).tool().toolDamage(2).toolSpeed(7).toolDurability(480).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build(); + event.setMaterial(Materials.Tritanium).tool().toolDamage(9).toolSpeed(15).toolDurability(9400).toolQuality(6).build(); + event.setMaterial(Materials.TungstenCarbide).tool().toolDamage(4).toolSpeed(10).toolDurability(5120).toolQuality(4).build(); + event.setMaterial(Materials.TungstenSteel).tool(Materials.TungstenCarbide).toolEnchantments(of(Enchantments.SHARPNESS, 4)).build(); + event.setMaterial(Materials.VanadiumSteel).tool().toolDamage(3).toolSpeed(7).toolDurability(512).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 3)).build(); + event.setMaterial(Materials.Vibranium).tool().toolDamage(15).toolSpeed(1000).toolDurability(512).toolQuality(15).toolEnchantments(of(Enchantments.BLOCK_FORTUNE, 5, Enchantments.MOB_LOOTING, 10)).build(); + event.setMaterial(Materials.WroughtIron).tool(Iron).toolDurability(384).build() + .addArmor(new int[]{2, 6, 5, 2}, 1.0F, 0.0F, 17, of(Enchantments.ALL_DAMAGE_PROTECTION, 1)); + /** + ** Gems + **/ + /** + * Regular + **/ + event.setMaterial(Materials.Amber).tool().toolDamage(3).toolSpeed(4).toolDurability(256).toolQuality(3).toolEnchantments(of(Enchantments.SILK_TOUCH, 1)).build(); + event.setMaterial(Materials.Amethyst).tool().toolDamage(3).toolSpeed(7).toolDurability(256).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 3)).build() + .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30); + event.setMaterial(Materials.Sapphire).tool().toolDamage(3).toolSpeed(7).toolDurability(512).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 3)).build() + .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30).harvestLevel(2); + event.setMaterial(Materials.BlueTopaz).tool().toolDamage(3).toolSpeed(7).toolDurability(256).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 5)).build(); + event.setMaterial(Materials.GreenSapphire).tool(Materials.Sapphire).toolEnchantments(of(Data.IMPLOSION, 3)).build() + .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30) + .harvestLevel(2); + event.setMaterial(Materials.Jade).tool().toolDamage(2).toolSpeed(8).toolDurability(512).toolQuality(2).toolEnchantments(of(Enchantments.BLOCK_FORTUNE, 3, Enchantments.MOB_LOOTING, 6, Data.IMPLOSION, 3)).build(); + event.setMaterial(Materials.Olivine).tool().toolDamage(2).toolSpeed(7).toolDurability(256).toolQuality(2).toolEnchantments(of(Data.IMPLOSION, 2)).build().harvestLevel(2); + event.setMaterial(Materials.Opal).tool(Materials.Olivine).toolEnchantments(of(Data.IMPLOSION, 4)).build(); + event.setMaterial(Materials.Ruby).tool(Materials.Sapphire).toolEnchantments(of(Data.IMPLOSION, 3)).build() + .addArmor(new int[]{3, 7, 7, 3}, 1.0F, 0.0F, 30); + event.setMaterial(Materials.Tanzanite).tool(Materials.Olivine).toolEnchantments(of(Data.IMPLOSION, 4)).build(); + event.setMaterial(Materials.Topaz).tool(Materials.BlueTopaz).toolEnchantments(of(Data.IMPLOSION, 5)).build(); + /** + * Basic + **/ + event.setMaterial(Materials.CertusQuartz).tool(Iron).toolDurability(256).build(); + event.setMaterial(Materials.Fluix).tool(Iron).toolDamage(2.4f).toolDurability(768).toolEnchantments(of(Enchantments.MOB_LOOTING, 1, Enchantments.BLOCK_FORTUNE, 1)).build(); + /** + ** Plastic Related + **/ + event.setMaterial(Materials.Rubber).tool().toolDamage(-1).toolSpeed(0.15f).toolDurability(256).toolEnchantments(of(Enchantments.KNOCKBACK, 2)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); + event.setMaterial(Materials.EpoxyResin).tool().toolSpeed(2.25f).toolDurability(32).toolQuality(1).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); + event.setMaterial(Materials.Plastic).tool().toolSpeed(0.3f).toolDurability(256).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 1)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); + event.setMaterial(Materials.PolyvinylChloride).tool().toolSpeed(0.3f).toolDurability(256).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 1)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); + event.setMaterial(Materials.SiliconeRubber).tool().toolSpeed(0.3f).toolDurability(1024).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 2)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); + event.setMaterial(Materials.StyreneButadieneRubber).tool().toolSpeed(0.3f).toolDurability(1024).toolQuality(1).toolEnchantments(of(Enchantments.KNOCKBACK, 2)).allowedToolTypes(List.of(AntimatterDefaultTools.SOFT_HAMMER)).build(); + } + + + private static void nuclearIsotopes(GregTechMaterialEvent event){ + /** + *** Isotopes (Solids) + **/ + event.setMaterial(Materials.Cobalt60).asMetal(1768, ROD); + event.setMaterial(Materials.Thorium230).asMetal(2028, 0, ROD); + event.setMaterial(Materials.Uranium233).asMetal(1406, ROD); + event.setMaterial(Materials.Uranium235).asMetal(1406, ROD); + event.setMaterial(Materials.Plutonium239).asMetal(912, ROD); + event.setMaterial(Materials.Plutonium241).asMetal(912, ROD); + event.setMaterial(Materials.Plutonium243).asMetal(912, ROD); + event.setMaterial(Materials.Americium241).asMetal(1449, ROD); + event.setMaterial(Materials.Americium242).asMetal(1449, ROD); + /** + *** Isotopes (Fluids) + **/ + /** + *** Isotopes (Gases/Plasmas) + **/ + event.setMaterial(Materials.HotHelium).asGas(0, 1150).fluidDensity(1000); + event.setMaterial(Materials.Deuterium).asGas().fluidDensity(-1112); + event.setMaterial(Materials.Tritium).asGas().fluidDensity(-1112); + event.setMaterial(Materials.Helium3).asGas().fluidDensity(-560); + /** + * Tetrafluorides + */ + event.setMaterial(Materials.UraniumTetrafluoride).asDust().mats(of(Materials.Uranium,1, Materials.Fluorine,4)); + event.setMaterial(Materials.Uranium235Tetrafluoride).asDust().mats(of(Materials.Uranium235, 1, Materials.Fluorine, 4)); + event.setMaterial(Materials.Uranium238Tetrafluoride).asDust().mats(of(Materials.Uranium, 1, Materials.Fluorine, 4)); + /** + * Hexafluorides + */ + event.setMaterial(Materials.UraniumHexafluoride).asGas().fluidDensity(2708); + event.setMaterial(Materials.Uranium238Hexafluoride).asGas().mats(of(Materials.Uranium,1, Materials.Fluorine,6)).fluidDensity(2708); + event.setMaterial(Materials.Uranium235Hexafluoride).asGas().mats(of(Materials.Uranium235,1, Materials.Fluorine,6)).fluidDensity(2708); + } + + + private static void workbenches(GregTechMaterialEvent event){ + METAL.all().forEach(m -> { + if ((m.getElement() == null || !m.getElement().isIsotope) && m.has(PLATE) && m.has(ROD)){ + + GTCoreBlocks.createWorkbench(m, false); + GTCoreBlocks.createWorkbench(m, true); + GTCoreBlocks.createLocker(m, false); + GTCoreBlocks.createLocker(m, true); + if (m != GTCoreMaterials.Ironwood) { + GTCoreBlocks.createMassStorage(m, 1000000); + } + GTCoreBlocks.createChest(m, true); + m.flags(RING, SCREW); + GTCoreBlocks.createBarrel(m, true); + } + }); + } + + public static void byproducts(GregTechMaterialEvent event){ + event.setMaterial(Materials.Almandine).addByProduct(Materials.RedGarnet, Materials.Alumina); + event.setMaterial(Materials.Alumina).addByProduct(Materials.Bauxite); + //event.setMaterial(Amber).addByProduct(Amber); TODO: Add Amber + event.setMaterial(Materials.Amethyst).addByProduct(Materials.Amethyst); + event.setMaterial(Materials.Monazite).addByProduct(Materials.Thorium, Materials.Neodymium, Materials.RareEarth); + event.setMaterial(Materials.Apatite).addByProduct(Materials.TricalciumPhosphate, Materials.Fluorite); + event.setMaterial(Materials.Andradite).addByProduct(Materials.YellowGarnet, Iron, Materials.Boron); + event.setMaterial(Materials.Antimony).addByProduct(Materials.Zinc, Iron); + event.setMaterial(Materials.Ash).addByProduct(Materials.Carbon); + event.setMaterial(Basalt).addByProduct(Materials.Olivine, Materials.DarkAsh); + event.setMaterial(Materials.Bastnasite).addByProduct(Materials.Neodymium, Materials.RareEarth); + event.setMaterial(Materials.Bauxite).addByProduct(Materials.Grossular, Materials.Rutile, Materials.Gallium); + event.setMaterial(Materials.Bentonite).addByProduct(Materials.Alumina, Materials.Calcium, Materials.Magnesium).elecTicks(480); + event.setMaterial(Materials.Beryllium).addByProduct(Emerald); + event.setMaterial(Materials.BlackGranite).addByProduct(Materials.Biotite); + event.setMaterial(Materials.Sapphire).addByProduct(Materials.Alumina); + event.setMaterial(Materials.GreenSapphire).addByProduct(Materials.Alumina); + event.setMaterial(Materials.Brass).addByProduct(Copper, Materials.Tin); + event.setMaterial(Materials.Bronze).addByProduct(Copper, Materials.Zinc); + event.setMaterial(Materials.BrownLimonite).addByProduct(Materials.Malachite, Materials.YellowLimonite); + event.setMaterial(Materials.Calcite).addByProduct(Materials.Andradite, Materials.Malachite); + event.setMaterial(Materials.Cassiterite).addByProduct(Materials.Tin); + event.setMaterial(Materials.Chalcopyrite).addByProduct(Materials.Pyrite, Materials.Cobalt, Materials.Cadmium).bathMercury(Gold).bathPersulfate(Materials.Cobalt); + event.setMaterial(Materials.Chromium).addByProduct(Iron, Materials.Magnesium); + event.setMaterial(Materials.Chromite).addByProduct(Iron, Materials.Magnesium); + event.setMaterial(Materials.Cinnabar).addByProduct(Redstone, Materials.Sulfur, Glowstone); + event.setMaterial(Materials.Clay).addByProduct(Materials.Clay); + event.setMaterial(Coal).addByProduct(Materials.Lignite, Materials.Thorium); + event.setMaterial(Materials.Cobalt).addByProduct(Materials.Cobaltite); + event.setMaterial(Materials.Cobaltite).addByProduct(Materials.Cobalt, Materials.Cobalt); + event.setMaterial(Copper).addByProduct(Materials.Cobalt, Gold, Materials.Nickel).bathMercury(Gold).bathPersulfate(Copper); + event.setMaterial(Materials.DarkAsh).addByProduct(Materials.Carbon); + event.setMaterial(Diamond).addByProduct(Materials.Graphite); + event.setMaterial(Materials.Electrum).addByProduct(Gold, Materials.Silver); + event.setMaterial(Emerald).addByProduct(Materials.Beryllium, Materials.Alumina); + event.setMaterial(Endstone).addByProduct(Materials.Helium3); + event.setMaterial(Materials.EnrichedNaquadah).addByProduct(Materials.Naquadah, Materials.Naquadria); + event.setMaterial(Flint).addByProduct(Materials.Obsidian); + event.setMaterial(Materials.Galena).addByProduct(Materials.Sulfur, Materials.Silver, Materials.Lead).bathMercury(Materials.Silver); + event.setMaterial(Materials.Garnierite).addByProduct(Materials.Nickel).bathPersulfate(Materials.Nickel); + event.setMaterial(Materials.Glauconite).addByProduct(Materials.Sodium, Materials.Alumina, Iron); + event.setMaterial(Glowstone).addByProduct(Redstone, Gold); + event.setMaterial(Gold).addByProduct(Copper, Materials.Nickel).bathMercury(Gold).bathPersulfate(Copper); + event.setMaterial(Materials.Graphite).addByProduct(Materials.Carbon); + event.setMaterial(Materials.Grossular).addByProduct(Materials.YellowGarnet, Materials.Calcium); + event.setMaterial(Materials.Ilmenite).addByProduct(Iron, Materials.Rutile); + event.setMaterial(Materials.Iridium).addByProduct(Materials.Platinum, Materials.Osmium).bathMercury(Materials.Platinum); + event.setMaterial(Iron).addByProduct(Materials.Nickel, Materials.Tin).bathPersulfate(Materials.Nickel); + event.setMaterial(Lapis).addByProduct(Materials.Calcite, Materials.Pyrite); + event.setMaterial(Materials.Lead).addByProduct(Materials.Silver, Materials.Sulfur).bathMercury(Materials.Silver); + event.setMaterial(Materials.Lepidolite).addByProduct(Materials.Lithium, Materials.Caesium, Materials.Boron); + event.setMaterial(Materials.Lignite).addByProduct(Coal); + event.setMaterial(Materials.Magnesite).addByProduct(Materials.Magnesium); + event.setMaterial(Materials.Magnesium).addByProduct(Materials.Olivine); + event.setMaterial(Materials.Magnetite).addByProduct(Iron, Gold).bathMercury(Gold); + event.setMaterial(Materials.Malachite).addByProduct(Copper, Materials.BrownLimonite, Materials.Calcite).bathPersulfate(Copper); + event.setMaterial(Materials.Manganese).addByProduct(Materials.Chromium, Iron); + event.setMaterial(Materials.Marble).addByProduct(Materials.Calcite); + event.setMaterial(Materials.Molybdenite).addByProduct(Materials.Powellite, Materials.Scheelite, Materials.Wulfenite, Materials.Osmium); + event.setMaterial(Materials.Molybdenum).addByProduct(Materials.Powellite, Materials.Scheelite, Materials.Wulfenite, Materials.Osmium); + event.setMaterial(Materials.Naquadah).addByProduct(Materials.EnrichedNaquadah); + event.setMaterial(Materials.Neodymium).addByProduct(Materials.RareEarth); + event.setMaterial(Netherrack).addByProduct(Materials.Sulfur); + event.setMaterial(Materials.Neutronium).addByProduct(Materials.Neutronium); + event.setMaterial(Materials.Nickel).addByProduct(Materials.Cobalt, Materials.Platinum, Iron).bathMercury(Materials.Platinum).bathPersulfate(Materials.Nickel); + event.setMaterial(Materials.Obsidian).addByProduct(Materials.Olivine); + event.setMaterial(Materials.Olivine).addByProduct(Materials.Pyrope, Materials.Magnesium); + event.setMaterial(Materials.Opal).addByProduct(Materials.Tanzanite); + event.setMaterial(Materials.Osmium).addByProduct(Materials.Iridium).bathMercury(Materials.Osmium); + event.setMaterial(Materials.Pentlandite).addByProduct(Iron, Materials.Sulfur, Materials.Cobalt).bathPersulfate(Materials.Cobalt); + event.setMaterial(Materials.Phosphate).addByProduct(Materials.Phosphor); + event.setMaterial(Materials.Phosphor).addByProduct(Materials.Phosphate); + event.setMaterial(Materials.TricalciumPhosphate).addByProduct(Materials.Phosphate, Materials.Fluorite); + event.setMaterial(Materials.Pitchblende).addByProduct(Materials.Lead, Materials.Thorium, Materials.RareEarth); + event.setMaterial(Materials.Platinum).addByProduct(Materials.Nickel, Materials.Iridium).bathMercury(Materials.Platinum).bathPersulfate(Materials.Nickel); + event.setMaterial(Materials.Plutonium).addByProduct(Materials.Uranium, Materials.Lead); + event.setMaterial(Materials.Powellite).addByProduct(Materials.Molybdenite, Materials.Scheelite); + event.setMaterial(Materials.Pyrite).addByProduct(Materials.Sulfur, Materials.TricalciumPhosphate, Iron); + event.setMaterial(Materials.Pyrolusite).addByProduct(Materials.Manganese); + event.setMaterial(Materials.Pyrope).addByProduct(Materials.RedGarnet, Materials.Magnesium); + event.setMaterial(Materials.Rutile).addByProduct(Materials.Hematite, Materials.Zircon); + event.setMaterial(Materials.Zircon).addByProduct(Materials.Rutile, Materials.Hafnium, Materials.Uraninite); + event.setMaterial(Quartz).addByProduct(Netherrack); + event.setMaterial(Materials.MilkyQuartz).addByProduct(Materials.Barite); + event.setMaterial(Materials.RedGarnet).addByProduct(Materials.Spessartine, Materials.Pyrope, Materials.Almandine); + event.setMaterial(Redstone).addByProduct(Materials.Cinnabar, Materials.RareEarth, Glowstone); + event.setMaterial(Materials.RedGranite).addByProduct(Materials.PotassiumFeldspar); + event.setMaterial(Materials.RockSalt).addByProduct(Materials.Salt); + event.setMaterial(Materials.Ruby).addByProduct(Materials.Chromium, Materials.RedGarnet); + event.setMaterial(Materials.Salt).addByProduct(Materials.RockSalt); + event.setMaterial(Materials.Saltpeter).addByProduct(Materials.Saltpeter); + event.setMaterial(Materials.Scheelite).addByProduct(Materials.Manganese, Materials.Molybdenum, Materials.Calcium).elecTicks(120); //1920 eu/tick + event.setMaterial(Materials.Sheldonite).addByProduct(Materials.Palladium, Materials.Nickel, Materials.Iridium).bathMercury(Materials.Sheldonite).bathPersulfate(Materials.Nickel); + event.setMaterial(Materials.Silicon).addByProduct(Materials.SiliconDioxide); + event.setMaterial(Materials.Silver).addByProduct(Materials.Lead, Materials.Sulfur).bathMercury(Materials.Silver); + event.setMaterial(Materials.Sodalite).addByProduct(Materials.Lazurite, Lapis); + event.setMaterial(Materials.Sperrylite).addByProduct(Materials.Antimony, Copper, Materials.Sheldonite, Materials.Hematite).bathMercury(Materials.Sheldonite).bathPersulfate(Copper); + event.setMaterial(Materials.Spessartine).addByProduct(Materials.RedGarnet, Materials.Manganese); + event.setMaterial(Materials.Sphalerite).addByProduct(Materials.YellowGarnet, Materials.Cadmium, Materials.Indium, Materials.Zinc).bathPersulfate(Materials.Zinc); + event.setMaterial(Materials.Spodumene).addByProduct(Materials.Alumina, Materials.Lithium); + event.setMaterial(Materials.Steel).addByProduct(Iron); + event.setMaterial(Materials.Stibnite).addByProduct(Materials.Antimony); + event.setMaterial(Materials.Sulfur).addByProduct(Materials.Sulfur); + event.setMaterial(Materials.Tantalite).addByProduct(Materials.Manganese, Materials.Niobium, Materials.Tantalum); + event.setMaterial(Materials.Tanzanite).addByProduct(Materials.Opal); + event.setMaterial(Materials.Tetrahedrite).addByProduct(Materials.Antimony, Materials.Zinc).bathPersulfate(Materials.Tetrahedrite); + event.setMaterial(Materials.Thorium).addByProduct(Materials.Lead, Materials.Thorium, Materials.Indium); + event.setMaterial(Materials.Tin).addByProduct(Iron, Materials.Zinc).bathPersulfate(Materials.Zinc); + event.setMaterial(Materials.Titanium).addByProduct(Materials.Almandine); + event.setMaterial(Materials.Tungstate).addByProduct(Materials.Manganese, Materials.Silver, Materials.Lithium).bathMercury(Materials.Silver); + event.setMaterial(Materials.Tungsten).addByProduct(Materials.Manganese, Materials.Molybdenum); + event.setMaterial(Materials.Uraninite).addByProduct(Materials.Lead, Materials.Thorium, Materials.RareEarth); + event.setMaterial(Materials.Uvarovite).addByProduct(Materials.YellowGarnet, Materials.Chromium); + event.setMaterial(Materials.VanadiumMagnetite).addByProduct(Materials.Magnetite, Materials.Vanadium); + event.setMaterial(Materials.Wulfenite).addByProduct(Materials.Powellite/*, Sheelite*/, Materials.Molybdenite, Materials.Galena); + event.setMaterial(Materials.YellowGarnet).addByProduct(Materials.Andradite, Materials.Grossular, Materials.Uvarovite); + event.setMaterial(Materials.YellowLimonite).addByProduct(Materials.Nickel, Materials.BrownLimonite, Materials.Cobalt).bathPersulfate(Materials.Nickel); + event.setMaterial(Materials.Zinc).addByProduct(Materials.Tin, Materials.Gallium).bathPersulfate(Materials.Zinc); + } + + private static void flags(GregTechMaterialEvent event){ + GT5RMaterialTags.BRITTLEG.add(Coal, Charcoal, Materials.Lignite, Materials.PetroleumCoke, Materials.CoalCoke, Materials.LigniteCoke); + GT5RMaterialTags.CALCITE2X.add(Materials.Pyrite, Materials.YellowLimonite); + GT5RMaterialTags.CALCITE3X.add(Iron, Materials.BrownLimonite); + GT5RMaterialTags.CENT5.add(/*Chrysolite*/ Flint, /*Niter*/ Materials.Glass, /*Perlite*/ Materials.WroughtIron, Materials.DarkAsh, Materials.AnnealedCopper, + Materials.Cinnabar); + GT5RMaterialTags.CENT10.add(Materials.Magnalium, Materials.VanadiumMagnetite, Materials.BrownLimonite, Materials.YellowLimonite, Materials.BlackGranite, Materials.Cupronickel, Materials.NiobiumTitanium, Materials.BorosilicateGlass, + Materials.GalliumArsenide, Materials.Marble, Materials.Limestone, Materials.Invar, Materials.TinAlloy, Materials.TungstenCarbide, EnderEye, Materials.Powellite, Materials.VanadiumGallium, Blaze, + Materials.TungstenSteel, Materials.Brass, Materials.Nichrome, Materials.Electrum, Materials.Bronze, Materials.Stibnite, Materials.Wulfenite, Materials.RedAlloy, Materials.SterlingSilver, Materials.RoseGold, Materials.BatteryAlloy, Materials.SolderingAlloy, Materials.TricalciumPhosphate); + GT5RMaterialTags.CENT15.add(Materials.Kanthal, Materials.IndiumGalliumPhosphide, Materials.BlackSteel, Materials.RedGarnet, Materials.YellowGarnet, Materials.BismuthBronze, Materials.BlackBronze, Materials.VanadiumSteel, Materials.CdInAGAlloy, Materials.CobaltBrass, + Materials.Pitchblende, Redstone, Materials.HSSS); + GT5RMaterialTags.CENT20.add(Lapis, Materials.Tetrahedrite, Materials.RedSteel, Materials.BlueSteel, Basalt, Materials.HSSE, Materials.Sheldonite, Materials.HSSG, Materials.Komatiite); + GT5RMaterialTags.CENT.add(GT5RMaterialTags.CENT5.all().toArray(new Material[0])); + GT5RMaterialTags.CENT.add(GT5RMaterialTags.CENT10.all().toArray(new Material[0])); + GT5RMaterialTags.CENT.add(GT5RMaterialTags.CENT15.all().toArray(new Material[0])); + GT5RMaterialTags.CENT.add(GT5RMaterialTags.CENT20.all().toArray(new Material[0])); + GT5RMaterialTags.RECIPE_MASS.add(Materials.Lead, 64); + FURNACE_FUELS.add(Materials.CoalCoke, GEM, 3200); + FURNACE_FUELS.add(Materials.CoalCoke, DUST, 3200); + FURNACE_FUELS.add(Materials.CoalCoke, BLOCK, 32000); + FURNACE_FUELS.add(Materials.Lignite, GEM, 800); + FURNACE_FUELS.add(Materials.Lignite, DUST, 800); + FURNACE_FUELS.add(Materials.Lignite, RAW_ORE, 800); + FURNACE_FUELS.add(Materials.Lignite, CRUSHED, 900); + FURNACE_FUELS.add(Materials.Lignite, CRUSHED_PURIFIED, 1000); + FURNACE_FUELS.add(Materials.Lignite, DUST_IMPURE, 800); + FURNACE_FUELS.add(Materials.Lignite, DUST_PURE, 800); + FURNACE_FUELS.add(Materials.Lignite, CRUSHED_REFINED, 1100); + FURNACE_FUELS.add(Materials.Lignite, BLOCK, 8000); + FURNACE_FUELS.add(Materials.LigniteCoke, GEM, 1600); + FURNACE_FUELS.add(Materials.LigniteCoke, DUST, 1600); + FURNACE_FUELS.add(Materials.LigniteCoke, BLOCK, 16000); + FURNACE_FUELS.add(Materials.PetroleumCoke, GEM, 6400); + FURNACE_FUELS.add(Materials.PetroleumCoke, DUST, 6400); + FURNACE_FUELS.add(Materials.PetroleumCoke, BLOCK, 64000); + FURNACE_FUELS.add(Coal, DUST, 1600); + FURNACE_FUELS.add(Coal, RAW_ORE, 1600); + FURNACE_FUELS.add(Coal, CRUSHED, 1800); + FURNACE_FUELS.add(Coal, CRUSHED_PURIFIED, 2000); + FURNACE_FUELS.add(Coal, DUST_IMPURE, 1600); + FURNACE_FUELS.add(Coal, DUST_PURE, 1600); + FURNACE_FUELS.add(Coal, CRUSHED_REFINED, 2200); + FURNACE_FUELS.add(Charcoal, DUST, 1600); + FURNACE_FUELS.add(Charcoal, BLOCK, 16000); + FURNACE_FUELS.add(Materials.OilShale, DUST, 400); + FURNACE_FUELS.add(Materials.OilShale, RAW_ORE, 400); + RADIOACTIVE.add(Materials.Cobalt60, 2); + RADIOACTIVE.add(Materials.Astatine, 4); + RADIOACTIVE.add(Materials.Uranium235, 2); + RADIOACTIVE.add(Materials.Plutonium, 1); + RADIOACTIVE.add(Materials.Plutonium241, 3); + RADIOACTIVE.add(Materials.Plutonium243, 3); + RADIOACTIVE.add(Materials.Americium241, 4); + RADIOACTIVE.add(Materials.EnrichedNaquadah, 4); + RADIOACTIVE.add(Materials.Naquadria, 5); + GT5RMaterialTags.CRACK.add(Materials.RefineryGas, Materials.Naphtha, Materials.Ethane, Materials.Ethylene, Materials.Propane, Materials.Propene, Materials.Butane, Materials.Butene, Materials.Butadiene); + GT5RMaterialTags.CRYSTALLIZE.add(Lapis, Materials.Lazurite, Materials.Sodalite, Materials.MilkyQuartz, Quartz, Materials.CertusQuartz, Materials.Fluix, Materials.Jade, Materials.Amber, Materials.Apatite, Flint, EnderEye, EnderPearl); + GT5RMaterialTags.NON_GEMS.add(Coal, Charcoal, Materials.Lignite, Materials.CoalCoke, Materials.LigniteCoke, Materials.PetroleumCoke); + GT5RMaterialTags.ELEC30.add(Charcoal, Materials.Opal, Coal, Materials.CoalCoke, Materials.Lignite, Materials.SteelMagnetic, Materials.IronMagnetic, Materials.Quicklime, Materials.Quartzite, + Materials.SiliconDioxide, Materials.Wollastonite, Materials.CobaltOxide, Materials.Garnierite, Materials.CupricOxide, Materials.RockSalt, /*Zincite,*/Materials.Pyrolusite, /*ChromiumDioxide,*/ + Materials.Phosphate, /*NiobiumNitride,*/ Materials.GreenSapphire, Materials.Sapphire, Materials.NeodymiumMagnetic, Materials.Cassiterite, + Materials.PhosphorousPentoxide, Materials.Hematite, Materials.Massicot, Materials.ArsenicTrioxide, Sugar, Materials.Magnetite, Materials.AntimonyTrioxide, + Materials.Salt, Materials.SodiumBisulfate, Materials.PotassiumBisulfate, Materials.HydrochloricAcid, Materials.SaltWater, Materials.HydrochloricAcid, Diamond, + Materials.NickelSulfate, Water, Materials.DistilledWater, Materials.HeavyWater, Materials.SemiheavyWater, Materials.TritiatedWater, Materials.MilkyQuartz, Materials.FerricChloride, Materials.Sperrylite, Materials.LithiumChloride); + GT5RMaterialTags.ELEC60.add(Materials.CalciumChloride, Materials.SodiumHydroxide, Materials.Propene, Materials.Ethylene, Materials.Butene, Materials.Benzene, Materials.Styrene, Materials.Ethane, Materials.Ammonia, Materials.SodiumSulfide, Materials.Methane, + Materials.Magnesite, Materials.HydrofluoricAcid, Materials.HydrogenFluoride, Materials.Sphalerite, /*NitroCarbon,*/ Materials.SodaAsh, Materials.Calcite, Materials.Saltpeter, Materials.Monazite, + /*Wollastonite,*/ Materials.NitrogenMonoxide, Materials.Butane, Materials.CarbonMonoxide, Materials.Pyrite, Materials.RedGranite, Materials.Ferrosilite, Materials.Butadiene, Materials.Amethyst, + Materials.Molybdenite, Materials.Ruby, /*Kyanite,*/ Materials.NitrogenDioxide, Materials.DinitrogenTetroxide, Materials.Propane, Materials.Barite, Materials.Isoprene, + Materials.Chromite, EnderPearl, Materials.SiliconDioxide, Materials.Apatite, Materials.SulfurTrioxide, /*Pyrochlore, */ Materials.Toluene, Materials.Phosphate, + Materials.Tantalite, Materials.PhosphorousPentoxide, Materials.Osmiridium, Materials.Pentlandite, Materials.Steel, Materials.Graphite, Materials.MagnesiumChloride); + GT5RMaterialTags.ELEC90.add(Materials.Polydimethylsiloxane, Materials.AceticAcid, Materials.Olivine, Materials.Ethanol, Materials.Methanol, Materials.VinylAcetate, /*Gypsum,*/ Materials.Cobaltite, + /*Dymethylamine,*/ Materials.Chalcopyrite, /*Mirabilite,*/ Materials.Spodumene, /*Dolomite,*/ Materials.HypochlorousAcid, Materials.Chloramine, Materials.Bastnasite, + Materials.Chloromethane, Materials.Malachite, /*Borax, */ /*Kaolinite,*/ Materials.Obsidian, Materials.NitricAcid, Materials.VinylChloride, Materials.Acetone, /*Asbestos,*/ Materials.PotassiumFeldspar, + Materials.MethylAcetate, Materials.Sodalite, Materials.AllylChloride, Materials.Phenol, Materials.Glycerol, Materials.Talc, Materials.Soapstone, Materials.PhosphoricAcid, + Materials.Chlorobenzene, Materials.SulfuricAcid, Materials.Pyrope, Materials.SodiumPersulfate, Materials.Chloroform, Materials.Grossular, Materials.Spessartine, Materials.Almandine, Materials.Uvarovite, Materials.Andradite, + Emerald, Materials.Galena, Materials.Zircon); + GT5RMaterialTags.ELEC120.add(Materials.Clay, /*Trona,*/ Materials.BlueTopaz, Materials.Topaz, /*Pollucite,*/ Materials.CarbonDioxide, Materials.SulfurDioxide, Materials.Epichlorohydrin, Materials.Lepidolite, /*FullersEarth, Alunite,*/ Materials.Glauconite, + /*Mica,*/ Materials.Lazurite, Materials.Tanzanite, Materials.Biotite, Materials.StainlessSteel, Materials.Ultimet, Materials.CalciumAcetateSolution, Materials.Dimethyldichlorosilane, /*Vermiculate, Zeolite,*/ Materials.GlycerylTrinitrate); + GT5RMaterialTags.ELEC.add(GT5RMaterialTags.ELEC30.all().toArray(new Material[0])); + GT5RMaterialTags.ELEC.add(GT5RMaterialTags.ELEC60.all().toArray(new Material[0])); + GT5RMaterialTags.ELEC.add(GT5RMaterialTags.ELEC90.all().toArray(new Material[0])); + GT5RMaterialTags.ELEC.add(GT5RMaterialTags.ELEC120.all().toArray(new Material[0])); + GT5RMaterialTags.ELEC_CIRCUIT.add(Water, Materials.DistilledWater, Materials.SodiumBisulfate); + GT5RMaterialTags.ELECSEPG.add(Materials.VanadiumMagnetite, Materials.Magnetite); + GT5RMaterialTags.ELECSEPI.add(Materials.YellowLimonite, Materials.BrownLimonite, Materials.Tin, Materials.Chromium, Materials.Ilmenite, Materials.Hematite, Materials.Pyrite, Materials.Glauconite, Materials.Nickel, Materials.Chromite, Materials.Pentlandite, Materials.Manganese); + GT5RMaterialTags.ELECSEPN.add(Materials.Monazite, Materials.Bastnasite); + GT5RMaterialTags.GRINDABLE.add(/* Paper, */Coal, Charcoal, Materials.Lignite, Materials.Lead, Materials.Tin, Materials.SolderingAlloy, Flint, Gold, Materials.Silver, Iron, + Materials.IronMagnetic, Materials.Steel, Materials.SteelMagnetic, Materials.Zinc, Materials.Antimony, Copper, Materials.AnnealedCopper, Materials.Bronze, Materials.Nickel, Materials.Invar, + Materials.Brass, Materials.WroughtIron, Materials.Electrum, Materials.Clay, Blaze); + GT5RMaterialTags.NOBBF.add(Materials.Tetrahedrite, Materials.Chalcopyrite, Materials.Sheldonite, Materials.Pyrolusite, Materials.Magnesite, Materials.Molybdenite, Materials.Galena); + NOSMASH.add(Wood/* WoodSealed */, Materials.Sulfur, Materials.Saltpeter, Materials.Graphite, /* Paper, */Coal, Charcoal, Materials.Lignite, Materials.PetroleumCoke, Materials.Rubber, + Materials.StyreneButadieneRubber, Materials.Plastic, Materials.PolyvinylChloride, Materials.Polystyrene, Materials.SiliconeRubber, Materials.Polytetrafluoroethylene, Materials.NitroDiesel, + Materials.Concrete, Redstone, Glowstone, Netherrack, Stone, Materials.Brick, Endstone, Materials.Marble, Basalt, Materials.Obsidian, Flint, + Materials.RedGranite, Materials.BlackGranite, Materials.Salt, Materials.RockSalt, Materials.Glass, Diamond, Emerald, Materials.Amethyst, Materials.Tanzanite, Materials.Topaz, + /* Amber, */ Materials.Sapphire, Materials.Ruby, Materials.Opal, Materials.Olivine, Lapis, Materials.MilkyQuartz, Quartz, Materials.Phosphate, EnderPearl, EnderEye, Materials.Silicon); + GT5RMaterialTags.NOSMELT.add(Wood/* , WoodSealed */, Materials.Sulfur, Materials.Saltpeter, Materials.Graphite, /* Paper, */Coal, Charcoal, Materials.Lignite, + Materials.NitroDiesel, Emerald, Materials.Amethyst, Materials.Tanzanite, Materials.Topaz, /* Amber, */ Materials.Sapphire, Materials.Ruby, Materials.Opal, Materials.Olivine, + Lapis, Materials.Sodalite, Materials.Lazurite, Materials.Monazite , Materials.MilkyQuartz, Quartz, Materials.TricalciumPhosphate, Materials.Phosphate, + EnderPearl, EnderEye, Blaze); + RUBBERTOOLS.add(Materials.Rubber, Materials.StyreneButadieneRubber, Materials.Plastic, Materials.PolyvinylChloride, Materials.Polytetrafluoroethylene, Materials.SiliconeRubber, Materials.EpoxyResin); + GT5RMaterialTags.SMELTF.add(Materials.Concrete, Redstone, Glowstone, Materials.Glass, Blaze); + GT5RMaterialTags.SOLDER.add(Materials.Lead, Materials.Tin, Materials.SolderingAlloy); + GT5RMaterialTags.SOLDER.subTag(SubTag.BAD_SOLDER, Materials.Lead, Materials.Tin); + GT5RMaterialTags.SOLDER.subTag(SubTag.GOOD_SOLDER, Materials.SolderingAlloy, Materials.Tin); + WIRE.subTag(SubTag.COPPER_WIRE, Materials.AnnealedCopper); + WIRE.subTag(SubTag.COPPER_WIRE, Copper); + CABLE.subTag(SubTag.COPPER_CABLE, Materials.AnnealedCopper); + CABLE.subTag(SubTag.COPPER_CABLE, Copper); + + event.setMaterial(Materials.AnnealedCopper).setDirectSmeltInto(Copper).setMacerateInto(Copper); + event.setMaterial(Copper).setArcSmeltInto(Materials.AnnealedCopper); + event.setMaterial(Iron).setArcSmeltInto(Materials.WroughtIron); + event.setMaterial(Materials.IronMagnetic).setDirectSmeltInto(Iron).setMacerateInto(Iron).setArcSmeltInto(Materials.WroughtIron); + event.setMaterial(Materials.NeodymiumMagnetic).setDirectSmeltInto(Materials.Neodymium).setMacerateInto(Materials.Neodymium).setArcSmeltInto(Materials.Neodymium); + event.setMaterial(Materials.SteelMagnetic).setDirectSmeltInto(Materials.Steel).setMacerateInto(Materials.Steel).setArcSmeltInto(Materials.Steel); + event.setMaterial(Materials.WroughtIron).setDirectSmeltInto(Iron).setMacerateInto(Iron); + + /*event.setMaterial(BandedIron).setDirectSmeltInto(Iron); + event.setMaterial(BrownLimonite).setDirectSmeltInto(Iron); + event.setMaterial(Cassiterite).setDirectSmeltInto(Tin); + event.setMaterial(Chalcopyrite).setDirectSmeltInto(Copper); + event.setMaterial(Cinnabar).setDirectSmeltInto(Mercury); + event.setMaterial(Cobaltite).setDirectSmeltInto(Cobalt); + event.setMaterial(Cooperite).setDirectSmeltInto(Platinum); + event.setMaterial(Galena).setDirectSmeltInto(Lead); + event.setMaterial(Garnierite).setDirectSmeltInto(Nickel); + event.setMaterial(Magnesite).setDirectSmeltInto(Magnesium); + event.setMaterial(Magnetite).setDirectSmeltInto(Iron); + event.setMaterial(Malachite).setDirectSmeltInto(Copper); + event.setMaterial(Molybdenite).setDirectSmeltInto(Molybdenum); + event.setMaterial(Pentlandite).setDirectSmeltInto(Nickel); + event.setMaterial(Pyrite).setDirectSmeltInto(Iron); + event.setMaterial(Pyrolusite).setDirectSmeltInto(Manganese); + event.setMaterial(Sphalerite).setDirectSmeltInto(Zinc); + event.setMaterial(Stibnite).setDirectSmeltInto(Antimony); + event.setMaterial(Tetrahedrite).setDirectSmeltInto(Copper); + event.setMaterial(YellowLimonite).setDirectSmeltInto(Iron);*/ + + event.setMaterial(Materials.Cassiterite).setOreMulti(2).setSmeltingMulti(2); + event.setMaterial(Glowstone).setOreMulti(5).setSmeltingMulti(5); + event.setMaterial(Lapis).setOreMulti(6).setSmeltingMulti(6).setByProductMulti(4); + event.setMaterial(Materials.TricalciumPhosphate).setOreMulti(3).setSmeltingMulti(3); + event.setMaterial(Quartz).setOreMulti(2).setSmeltingMulti(2); + event.setMaterial(Redstone).setOreMulti(5).setSmeltingMulti(5); + event.setMaterial(Materials.RockSalt).setOreMulti(2).setSmeltingMulti(2); + event.setMaterial(Materials.Salt).setOreMulti(2).setSmeltingMulti(2); + event.setMaterial(Materials.Saltpeter).setOreMulti(4).setSmeltingMulti(4); + event.setMaterial(Materials.Scheelite).setOreMulti(2).setSmeltingMulti(2); + event.setMaterial(Materials.Tungstate).setOreMulti(2).setSmeltingMulti(2); + event.setMaterial(Materials.Monazite).setOreMulti(8); + event.setMaterial(Materials.Apatite).setOreMulti(4); + event.setMaterial(Materials.CertusQuartz).setOreMulti(2); + event.setMaterial(Materials.Lazurite).setOreMulti(6); + event.setMaterial(Materials.Sodalite).setOreMulti(6); + event.setMaterial(Materials.TricalciumPhosphate).setOreMulti(3); + + // Plastic.setEnchantmentForTools(Enchantment.knockback, 1); + // PolyvinylChloride.setEnchantmentForTools(Enchantment.knockback, 1); + // Polystyrene.setEnchantmentForTools(Enchantment.knockback, 1); + // Rubber.setEnchantmentForTools(Enchantment.knockback, 2); + // StyreneButadieneRubber.setEnchantmentForTools(Enchantment.knockback, 2); + // Flint.setEnchantmentForTools(Enchantment.fireAspect, 1); + // Blaze.setEnchantmentForTools(Enchantment.fireAspect, 3); + // EnderPearl.setEnchantmentForTools(Enchantment.silkTouch, 1); + // NetherStar.setEnchantmentForTools(Enchantment.silkTouch, 1); + // BlackBronze.setEnchantmentForTools(Enchantment.smite, 2); + // Gold.setEnchantmentForTools(Enchantment.smite, 3); + // RoseGold.setEnchantmentForTools(Enchantment.smite, 4); + // Platinum.setEnchantmentForTools(Enchantment.smite, 5); + // Lead.setEnchantmentForTools(Enchantment.baneOfArthropods, 2); + // Nickel.setEnchantmentForTools(Enchantment.baneOfArthropods, 2); + // Invar.setEnchantmentForTools(Enchantment.baneOfArthropods, 3); + // Antimony.setEnchantmentForTools(Enchantment.baneOfArthropods, 3); + // BatteryAlloy.setEnchantmentForTools(Enchantment.baneOfArthropods, 4); + // Bismuth.setEnchantmentForTools(Enchantment.baneOfArthropods, 4); + // BismuthBronze.setEnchantmentForTools(Enchantment.baneOfArthropods, 5); + // Iron.setEnchantmentForTools(Enchantment.sharpness, 1); + // Bronze.setEnchantmentForTools(Enchantment.sharpness, 1); + // Brass.setEnchantmentForTools(Enchantment.sharpness, 2); + // Steel.setEnchantmentForTools(Enchantment.sharpness, 2); + // WroughtIron.setEnchantmentForTools(Enchantment.sharpness, 2); + // StainlessSteel.setEnchantmentForTools(Enchantment.sharpness, 3); + // BlackSteel.setEnchantmentForTools(Enchantment.sharpness, 4); + // RedSteel.setEnchantmentForTools(Enchantment.sharpness, 4); + // BlueSteel.setEnchantmentForTools(Enchantment.sharpness, 5); + // DamascusSteel.setEnchantmentForTools(Enchantment.sharpness, 5); + // TungstenCarbide.setEnchantmentForTools(Enchantment.sharpness, 5); + // HSSE.setEnchantmentForTools(Enchantment.sharpness, 5); + // HSSG.setEnchantmentForTools(Enchantment.sharpness, 4); + // HSSS.setEnchantmentForTools(Enchantment.sharpness, 5); + // Lava.setTemperatureDamage(3.0F); + + + // Glue.mChemicalFormula = "No Horses were harmed for the Production"; + // UUAmplifier.mChemicalFormula = "Accelerates the Mass Fabricator"; + // WoodSealed.mChemicalFormula = ""; + // Wood.mChemicalFormula = ""; + + // Naquadah.mMoltenRGBa[0] = 0; + // Naquadah.mMoltenRGBa[1] = 255; + // Naquadah.mMoltenRGBa[2] = 0; + // Naquadah.mMoltenRGBa[3] = 0; + // NaquadahEnriched.mMoltenRGBa[0] = 64; + // NaquadahEnriched.mMoltenRGBa[1] = 255; + // NaquadahEnriched.mMoltenRGBa[2] = 64; + // NaquadahEnriched.mMoltenRGBa[3] = 0; + // Naquadria.mMoltenRGBa[0] = 128; + // Naquadria.mMoltenRGBa[1] = 255; + // Naquadria.mMoltenRGBa[2] = 128; + // Naquadria.mMoltenRGBa[3] = 0; + + // NaquadahEnriched.mChemicalFormula = "Nq+"; + // Naquadah.mChemicalFormula = "Nq"; + // Naquadria.mChemicalFormula = "NqX"; + } + + private static void antimatterMaterials(GregTechMaterialEvent event){ + event.setMaterial(Basalt).mats(of(Materials.Olivine, 1, Materials.Calcite, 3, Flint, 8, Materials.DarkAsh, 4)); + event.setMaterial(Blaze).mats(of(Materials.Sulfur, 1, Materials.DarkAsh, 1)); + event.setMaterial(Coal).asGemBasic(false).flags(ORE_STONE, ROCK).mats(of(Materials.Carbon, 2)); + event.setMaterial(Copper).flags(PLATE, ROD_LONG, FOIL, WIRE_FINE, GEAR, BOLT); + event.setMaterial(Quartz).flags(GT5RMaterialTypes.CHAMBER); + event.setMaterial(Diamond).asGem(true).mats(of(Materials.Carbon, 64), 1).elecTicks(768).harvestLevel(3); + event.setMaterial(Emerald).asGem(true).mats(of(Materials.Alumina, 5, Materials.Beryllium, 3, Materials.SiliconDioxide, 18, Materials.Oxygen, 3)).elecTicks(540); + //.tool().toolDamage(3).toolSpeed(9).toolDurability(590).toolQuality(3).toolEnchantments(of(Data.IMPLOSION, 5)).build(); + event.setMaterial(EnderEye).asGemBasic(false, ROD_LONG, PLATE).mats(of(EnderPearl, 1, Blaze, 1)); + event.setMaterial(EnderPearl).mats(of(Materials.Beryllium, 1, Materials.Potassium, 4, Materials.Nitrogen, 5, Materials.Chlorine, 6)).elecTicks(220); + event.setMaterial(Gold).flags(FOIL, ROD_LONG, WIRE_FINE, GEAR); + event.setMaterial(Iron).flags(RING, ROD_LONG, GEAR, FRAME, GEAR_SMALL); + event.setMaterial(Wood).flags(FRAME); + event.setMaterial(AntimatterMaterials.Netherite).asMetal(2246, 1300, RING); + event.setMaterial(Lapis).asGemBasic(false, PLATE).mats(of(Materials.Lazurite, 12, Materials.Sodalite, 2, Materials.Pyrite, 1, Materials.Calcite, 1)); + event.setMaterial(Prismarine).mats(of(Materials.Potassium, 2, Materials.Oxygen, 8, Materials.Manganese, 1, Materials.Silicon, 5)); + event.setMaterial(Redstone).mats(of(Materials.Silicon, 1, Materials.Pyrite, 5, Materials.Ruby, 1, Materials.Mercury, 3)).asFluid(0, MaterialTags.MELTING_POINT.getInt(Redstone));//.setOreMulti(4); + event.setMaterial(Water).mats(of(Materials.Hydrogen, 2, Materials.Oxygen, 1)).elecTicks(2000); + event.setMaterial(Sugar).mats(of(Water, 11, Materials.Carbon, 12)).elecTicks(184); + event.setMaterial(Glowstone).asFluid(0, 1000).flags(MOLTEN); + event.setMaterial(Endstone).flags(ROD_LONG); + event.setMaterial(Flint).mats(of(Materials.SiliconDioxide, 1)).elecTicks(80); + } +} \ No newline at end of file diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RMaterialTags.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialTags.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/data/GT5RMaterialTags.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialTags.java index a3843d2f5..600d7ae6f 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RMaterialTags.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialTags.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.material.FluidProduct; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.material.MaterialTag; import muramasa.antimatter.material.tags.DoubleMaterialTag; import muramasa.antimatter.material.tags.ListMaterialTag; import muramasa.antimatter.material.tags.NumberMaterialTag; -import muramasa.gregtech.material.FluidProduct; public class GT5RMaterialTags { public static final MaterialTag ELEC = AntimatterAPI.register(MaterialTag.class, new MaterialTag("elec", true)); //Add Electrolyzer Recipes - SHOULD NOT SHARE MATS WITH CENT diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RMaterialTypes.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialTypes.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/data/GT5RMaterialTypes.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialTypes.java index 341b9d527..8d1345cb8 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RMaterialTypes.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialTypes.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RSounds.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RSounds.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/data/GT5RSounds.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RSounds.java index ef48d9636..d2aadbab9 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RSounds.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RSounds.java @@ -1,7 +1,7 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.AntimatterAPI; -import muramasa.gregtech.GT5RRef; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; diff --git a/common/src/main/java/muramasa/gregtech/data/GT5RTags.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RTags.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/data/GT5RTags.java rename to common/src/main/java/org/gtreimagined/gt5r/data/GT5RTags.java index 2c11f582d..80fd9d8d2 100644 --- a/common/src/main/java/muramasa/gregtech/data/GT5RTags.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RTags.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/common/src/main/java/muramasa/gregtech/data/Guis.java b/common/src/main/java/org/gtreimagined/gt5r/data/Guis.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/data/Guis.java rename to common/src/main/java/org/gtreimagined/gt5r/data/Guis.java index 88cc58b18..de683319f 100644 --- a/common/src/main/java/muramasa/gregtech/data/Guis.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/Guis.java @@ -1,5 +1,7 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityCoalBoiler; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.IGuiHandler; @@ -15,16 +17,15 @@ import muramasa.antimatter.gui.widget.WidgetSupplier; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.registration.Side; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityCoalBoiler; -import muramasa.gregtech.gui.widgets.*; +import muramasa.gt5r.gui.widgets.*; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; +import org.gtreimagined.gt5r.gui.widgets.*; import static muramasa.antimatter.gui.SlotType.*; import static muramasa.antimatter.gui.Widget.builder; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.Machines.*; +import static org.gtreimagined.gt5r.data.Machines.*; public class Guis { diff --git a/common/src/main/java/muramasa/gregtech/data/Machines.java b/common/src/main/java/org/gtreimagined/gt5r/data/Machines.java similarity index 81% rename from common/src/main/java/muramasa/gregtech/data/Machines.java rename to common/src/main/java/org/gtreimagined/gt5r/data/Machines.java index 958fec5b4..bb904f78e 100644 --- a/common/src/main/java/muramasa/gregtech/data/Machines.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/Machines.java @@ -1,5 +1,17 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.blockentity.miniportals.BlockEntityMiniEndPortal; +import org.gtreimagined.gt5r.blockentity.miniportals.BlockEntityMiniNetherPortal; +import org.gtreimagined.gt5r.blockentity.miniportals.BlockEntityMiniTwilightPortal; +import org.gtreimagined.gt5r.blockentity.multi.*; +import org.gtreimagined.gt5r.blockentity.single.*; +import org.gtreimagined.gt5r.client.GT5RModelManager; +import org.gtreimagined.gt5r.machine.MiniPortalMachine; +import org.gtreimagined.gt5r.machine.MultiblockTankMachine; +import org.gtreimagined.gt5r.machine.SecondaryOutputMachine; +import org.gtreimagined.gt5r.machine.SteamMachine; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.blockentity.single.BlockEntityBatteryBuffer; @@ -14,20 +26,10 @@ import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.block.BlockCasing; -import muramasa.gregtech.blockentity.miniportals.BlockEntityMiniEndPortal; -import muramasa.gregtech.blockentity.miniportals.BlockEntityMiniNetherPortal; -import muramasa.gregtech.blockentity.miniportals.BlockEntityMiniTwilightPortal; -import muramasa.gregtech.blockentity.multi.*; -import muramasa.gregtech.blockentity.single.*; -import muramasa.gregtech.client.GT5RModelManager; -import muramasa.gregtech.items.IItemReactorRod; -import muramasa.gregtech.machine.MiniPortalMachine; -import muramasa.gregtech.machine.MultiblockTankMachine; -import muramasa.gregtech.machine.SecondaryOutputMachine; -import muramasa.gregtech.machine.SteamMachine; +import org.gtreimagined.gt5r.block.BlockCasing; +import muramasa.gt5r.blockentity.multi.*; +import muramasa.gt5r.blockentity.single.*; +import org.gtreimagined.gt5r.items.IItemReactorRod; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; @@ -48,9 +50,6 @@ import static muramasa.antimatter.data.AntimatterMaterials.Wood; import static muramasa.antimatter.machine.MachineFlag.*; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.GT5RCovers.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.*; public class Machines { public static BasicMachine HULL = new BasicMachine(GT5RRef.ID, "hull").setTiers(Tier.getAllElectric()).overlayTexture(Textures.STATE_IGNORANT_TIER_SPECIFIC_OVERLAY_HANDLER).noCovers().addFlags(GUI, ITEM, FLUID).setTile(BlockEntityHull::new).addTooltipInfo((machine, stack, world, tooltip, flag) -> { @@ -65,16 +64,16 @@ public class Machines { /** ** Steam Singleblock Machines **/ - public static SteamMachine SOLID_FUEL_BOILER = new SteamMachine(GT5RRef.ID, "solid_fuel_boiler").setTiers(BRONZE, STEEL).setMap(SOLID_FUEL_BOILERS).addFlags(GUI, STEAM, ITEM, FLUID, CELL).baseTexture(Textures.BOILER_HANDLER).setTile(BlockEntityCoalBoiler::new).noCovers(); + public static SteamMachine SOLID_FUEL_BOILER = new SteamMachine(GT5RRef.ID, "solid_fuel_boiler").setTiers(BRONZE, STEEL).setMap(RecipeMaps.SOLID_FUEL_BOILERS).addFlags(GUI, STEAM, ITEM, FLUID, CELL).baseTexture(Textures.BOILER_HANDLER).setTile(BlockEntityCoalBoiler::new).noCovers(); public static SteamMachine LAVA_BOILER = new SteamMachine(GT5RRef.ID, "lava_boiler").setTiers(STEEL).addFlags(GUI, STEAM, ITEM, FLUID).setTile(BlockEntityLavaBoiler::new).noCovers(); public static SteamMachine SOLAR_BOILER = new SteamMachine(GT5RRef.ID, "solar_boiler").setTiers(BRONZE).addFlags(GUI, STEAM, ITEM, FLUID).setTile(BlockEntitySolarBoiler::new).allowFrontIO().noCovers(); - public static SteamMachine STEAM_ALLOY_SMELTER = new SteamMachine(GT5RRef.ID, "steam_alloy_smelter").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_ALLOY_SMELTER).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.FURNACE, 0.6f).covers(COVER_STEAM_VENT); - public static SteamMachine STEAM_COMPRESSOR = new SteamMachine(GT5RRef.ID, "steam_compressor").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_COMPRESSOR).addFlags(GUI, ITEM, FLUID).covers(COVER_STEAM_VENT); - public static SteamMachine STEAM_EXTRACTOR = new SteamMachine(GT5RRef.ID, "steam_extractor").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_EXTRACTOR).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.EXTRACTOR, 0.6f).covers(COVER_STEAM_VENT); - public static SteamMachine STEAM_FORGE_HAMMER = new SteamMachine(GT5RRef.ID, "steam_forge_hammer").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_FORGE_HAMMER).addFlags(GUI, ITEM, FLUID).covers(COVER_STEAM_VENT).setSound(SoundEvents.ANVIL_PLACE, 0.6f); - public static SteamMachine STEAM_FURNACE = new SteamMachine(GT5RRef.ID, "steam_furnace").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_FURNACE).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.FURNACE, 0.6f).covers(COVER_STEAM_VENT); - public static SteamMachine STEAM_MACERATOR = new SteamMachine(GT5RRef.ID, "steam_macerator").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_MACERATOR).addFlags(GUI, ITEM, FLUID).covers(COVER_STEAM_VENT).setSound(GT5RSounds.MACERATOR, 0.6f); - public static SteamMachine STEAM_SIFTER = new SteamMachine(GT5RRef.ID, "steam_sifter").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_SIFTER).addFlags(GUI, ITEM, FLUID).covers(COVER_STEAM_VENT); + public static SteamMachine STEAM_ALLOY_SMELTER = new SteamMachine(GT5RRef.ID, "steam_alloy_smelter").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_ALLOY_SMELTER).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.FURNACE, 0.6f).covers(GT5RCovers.COVER_STEAM_VENT); + public static SteamMachine STEAM_COMPRESSOR = new SteamMachine(GT5RRef.ID, "steam_compressor").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_COMPRESSOR).addFlags(GUI, ITEM, FLUID).covers(GT5RCovers.COVER_STEAM_VENT); + public static SteamMachine STEAM_EXTRACTOR = new SteamMachine(GT5RRef.ID, "steam_extractor").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_EXTRACTOR).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.EXTRACTOR, 0.6f).covers(GT5RCovers.COVER_STEAM_VENT); + public static SteamMachine STEAM_FORGE_HAMMER = new SteamMachine(GT5RRef.ID, "steam_forge_hammer").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_FORGE_HAMMER).addFlags(GUI, ITEM, FLUID).covers(GT5RCovers.COVER_STEAM_VENT).setSound(SoundEvents.ANVIL_PLACE, 0.6f); + public static SteamMachine STEAM_FURNACE = new SteamMachine(GT5RRef.ID, "steam_furnace").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_FURNACE).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.FURNACE, 0.6f).covers(GT5RCovers.COVER_STEAM_VENT); + public static SteamMachine STEAM_MACERATOR = new SteamMachine(GT5RRef.ID, "steam_macerator").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_MACERATOR).addFlags(GUI, ITEM, FLUID).covers(GT5RCovers.COVER_STEAM_VENT).setSound(GT5RSounds.MACERATOR, 0.6f); + public static SteamMachine STEAM_SIFTER = new SteamMachine(GT5RRef.ID, "steam_sifter").setTiers(BRONZE, STEEL).setMap(RecipeMaps.STEAM_SIFTER).addFlags(GUI, ITEM, FLUID).covers(GT5RCovers.COVER_STEAM_VENT); /** ** Hatchless Multiblock Machines (Steam Age) **/ @@ -115,19 +114,19 @@ public class Machines { public static BasicMachine FLUID_CANNER = new BasicMachine(GT5RRef.ID, "fluid_canner").setMap(RecipeMaps.FLUID_CANNER).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.EXTRACTOR, 0.6f); public static BasicMachine FLUID_PRESS = new BasicMachine(GT5RRef.ID, "fluid_press").setMap(RecipeMaps.FLUID_PRESS).addFlags(GUI, ITEM, FLUID); public static BasicMachine FLUID_HEATER = new BasicMachine(GT5RRef.ID, "fluid_heater").setMap(RecipeMaps.FLUID_HEATER).addFlags(GUI, ITEM, FLUID); - public static BasicMachine FLUID_SOLIDIFIER = new BasicMachine(GT5RRef.ID, "fluid_solidifier").setMap(FLUID_SOLIDIFYER).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.EXTRACTOR, 0.6f); + public static BasicMachine FLUID_SOLIDIFIER = new BasicMachine(GT5RRef.ID, "fluid_solidifier").setMap(RecipeMaps.FLUID_SOLIDIFYER).addFlags(GUI, ITEM, FLUID).setSound(GT5RSounds.EXTRACTOR, 0.6f); public static BasicMachine FORGE_HAMMER = new BasicMachine(GT5RRef.ID, "forge_hammer").setMap(RecipeMaps.FORGE_HAMMER).addFlags(GUI, ITEM).setSound(SoundEvents.ANVIL_PLACE, 0.6f); public static BasicMachine FORMING_PRESS = new BasicMachine(GT5RRef.ID, "forming_press").setMap(RecipeMaps.FORMING_PRESS).addFlags(GUI, ITEM); - public static BasicMachine FURNACE = new BasicMachine(GT5RRef.ID, "furnace").setMap(ELECTRIC_FURNACE).addFlags(GUI, ITEM).setSound(GT5RSounds.FURNACE, 0.6f); + public static BasicMachine FURNACE = new BasicMachine(GT5RRef.ID, "furnace").setMap(RecipeMaps.ELECTRIC_FURNACE).addFlags(GUI, ITEM).setSound(GT5RSounds.FURNACE, 0.6f); public static BasicMachine LASER_ENGRAVER = new BasicMachine(GT5RRef.ID, "laser_engraver").setMap(RecipeMaps.LASER_ENGRAVER).addFlags(GUI, ITEM).setSound(GT5RSounds.MAGNETIZER, 0.6f); public static BasicMachine LATHE = new BasicMachine(GT5RRef.ID, "lathe").setMap(RecipeMaps.LATHE).addFlags(GUI, ITEM); - public static BasicMachine MACERATOR = new BasicMachine(GT5RRef.ID, "macerator").setTiers(LV, MV, HV, EV).setMap(PULVERIZER).setTile(BlockEntityMacerator::new).addTooltipInfo("tooltip.macerator.0").setTierSpecificLang().custom().addFlags(GUI, ITEM).setSound(GT5RSounds.MACERATOR, 0.6f); + public static BasicMachine MACERATOR = new BasicMachine(GT5RRef.ID, "macerator").setTiers(LV, MV, HV, EV).setMap(RecipeMaps.PULVERIZER).setTile(BlockEntityMacerator::new).addTooltipInfo("tooltip.macerator.0").setTierSpecificLang().custom().addFlags(GUI, ITEM).setSound(GT5RSounds.MACERATOR, 0.6f); public static BasicMachine MASS_FABRICATOR = new BasicMachine(GT5RRef.ID, "mass_fabricator").setTiers(Tier.getStandardWithIV()).setMap(RecipeMaps.MASS_FABRICATOR).addFlags(GUI, ITEM, FLUID); public static BasicMachine MIXER = new BasicMachine(GT5RRef.ID, "mixer").setMap(RecipeMaps.MIXER).addFlags(GUI, ITEM, FLUID); public static BasicMachine ORE_WASHER = new BasicMachine(GT5RRef.ID, "ore_washer").setMap(RecipeMaps.ORE_WASHER).addFlags(GUI, ITEM, FLUID); public static BasicMachine PACKAGER = new BasicMachine(GT5RRef.ID, "packager").setMap(RecipeMaps.PACKAGER).addFlags(GUI, ITEM); public static BasicMachine POLARIZER = new BasicMachine(GT5RRef.ID, "polarizer").setMap(RecipeMaps.POLARIZER).addFlags(GUI, ITEM); - public static BasicMachine PRINTER = new BasicMachine(GT5RRef.ID, "printer").setTiers(Tier.LV).setMap(PRINTING).addFlags(GUI, ITEM, FLUID).setTile(BlockEntityPrinter::new); + public static BasicMachine PRINTER = new BasicMachine(GT5RRef.ID, "printer").setTiers(Tier.LV).setMap(RecipeMaps.PRINTING).addFlags(GUI, ITEM, FLUID).setTile(BlockEntityPrinter::new); public static BasicMachine ROASTER = new BasicMachine(GT5RRef.ID, "roaster").setMap(RecipeMaps.ROASTER).addFlags(GUI, ITEM, FLUID).amps(3).setTile(BlockEntityIUpgradedBatchMachine::new).addTooltipInfo((machine, stack, world, tooltip, flag) -> { tooltip.add(Utils.translatable("machine.upgraded_batch.parallel", 1 << (machine.getTier().getIntegerId() - 1))); }); @@ -159,7 +158,7 @@ public class Machines { * Drums */ public static DrumMachine BRONZE_DRUM = GTCoreBlocks.createDrum(Materials.Bronze, 16000); - public static DrumMachine STEEL_DRUM = GTCoreBlocks.createDrum(Steel, 48000); + public static DrumMachine STEEL_DRUM = GTCoreBlocks.createDrum(Materials.Steel, 48000); public static DrumMachine INVAR_DRUM = GTCoreBlocks.createDrum(Materials.Invar, 32000); public static DrumMachine STAINLESS_DRUM = GTCoreBlocks.createDrum(Materials.StainlessSteel, 64000).acidProof(); public static DrumMachine TITANIUM_DRUM = GTCoreBlocks.createDrum(Materials.Titanium, 128000); @@ -168,13 +167,13 @@ public class Machines { public static DrumMachine TUNGSTEN_DRUM = GTCoreBlocks.createDrum(Materials.Tungsten, 256000); public static MultiblockTankMachine WOOD_TANK = new MultiblockTankMachine(GT5RRef.ID, Wood, true, 432000); - public static MultiblockTankMachine[] STEEL_TANKS = createTankMachine(Steel, 3); - public static MultiblockTankMachine[] INVAR_TANKS = createTankMachine(Invar, 2); - public static MultiblockTankMachine[] STAINLESS_STEEL_TANKS = createTankMachine(StainlessSteel, 4); - public static MultiblockTankMachine[] TITANIUM_TANKS = createTankMachine(Titanium, 8); + public static MultiblockTankMachine[] STEEL_TANKS = createTankMachine(Materials.Steel, 3); + public static MultiblockTankMachine[] INVAR_TANKS = createTankMachine(Materials.Invar, 2); + public static MultiblockTankMachine[] STAINLESS_STEEL_TANKS = createTankMachine(Materials.StainlessSteel, 4); + public static MultiblockTankMachine[] TITANIUM_TANKS = createTankMachine(Materials.Titanium, 8); public static MultiblockTankMachine[] NETHERITE_TANKS = createTankMachine(Netherite, 8); - public static MultiblockTankMachine[] TUNGSTENSTEEL_TANKS = createTankMachine(TungstenSteel, 16); - public static MultiblockTankMachine[] TUNGSTEN_TANKS = createTankMachine(Tungsten, 16); + public static MultiblockTankMachine[] TUNGSTENSTEEL_TANKS = createTankMachine(Materials.TungstenSteel, 16); + public static MultiblockTankMachine[] TUNGSTEN_TANKS = createTankMachine(Materials.Tungsten, 16); /** * Transformers @@ -193,11 +192,11 @@ public class Machines { /** ** Generators **/ - public static GeneratorMachine COMBUSTION_GENERATOR = new GeneratorMachine(GT5RRef.ID, "combustion_generator").setTiers(LV, MV, HV).setMap(COMBUSTION_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO(); - public static GeneratorMachine SEMIFLUID_GENERATOR = new GeneratorMachine(GT5RRef.ID, "semifluid_generator").setTiers(LV, MV, HV).setMap(SEMI_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO(); - public static GeneratorMachine GAS_GENERATOR = new GeneratorMachine(GT5RRef.ID, "gas_turbine").setTiers(LV, MV, HV).setMap(GAS_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO().custom(); - public static GeneratorMachine NAQUADAH_GENERATOR = new GeneratorMachine(GT5RRef.ID, "naquadah_reactor").setTiers(EV, IV, LUV).setMap(NAQUADAH_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO(); - public static GeneratorMachine STEAM_GENERATOR = new GeneratorMachine(GT5RRef.ID, "steam_turbine").setTiers(LV, MV, HV).setMap(STEAM_FUELS).addFlags(GUI, ITEM, FLUID, CELL).setTile(BlockEntitySteamTurbine::new).efficiency(t -> { + public static GeneratorMachine COMBUSTION_GENERATOR = new GeneratorMachine(GT5RRef.ID, "combustion_generator").setTiers(LV, MV, HV).setMap(RecipeMaps.COMBUSTION_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO(); + public static GeneratorMachine SEMIFLUID_GENERATOR = new GeneratorMachine(GT5RRef.ID, "semifluid_generator").setTiers(LV, MV, HV).setMap(RecipeMaps.SEMI_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO(); + public static GeneratorMachine GAS_GENERATOR = new GeneratorMachine(GT5RRef.ID, "gas_turbine").setTiers(LV, MV, HV).setMap(RecipeMaps.GAS_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO().custom(); + public static GeneratorMachine NAQUADAH_GENERATOR = new GeneratorMachine(GT5RRef.ID, "naquadah_reactor").setTiers(EV, IV, LUV).setMap(RecipeMaps.NAQUADAH_FUELS).addFlags(GUI, ITEM, FLUID, CELL).allowFrontIO(); + public static GeneratorMachine STEAM_GENERATOR = new GeneratorMachine(GT5RRef.ID, "steam_turbine").setTiers(LV, MV, HV).setMap(RecipeMaps.STEAM_FUELS).addFlags(GUI, ITEM, FLUID, CELL).setTile(BlockEntitySteamTurbine::new).efficiency(t -> { return (4 - t.getIntegerId()) + 6; }).allowFrontIO().custom(); public static GeneratorMachine SOLAR_PANEL = new GeneratorMachine(GT5RRef.ID, "solar_panel").setTiers(NONE, ULV, LV).addFlags(GUI).removeFlags(COVERABLE).customShape(Shapes.box(0,0,0, 1, 0.5, 1)).itemModelParent(new ResourceLocation(GT5RRef.ID, "block/preset/solar_panel")).setVerticalFacingAllowed(false).setTile(BlockEntitySolarPanel::new).custom().addTooltipInfo((machine, stack, world, tooltip, flag) -> { @@ -206,24 +205,24 @@ public class Machines { tooltip.add(Utils.translatable("machine.power.capacity").append(": ").append(Utils.literal("" + 80).withStyle(ChatFormatting.BLUE))); } }); - public static BasicMachine NUCLEAR_REACTOR_CORE = new SecondaryOutputMachine(GT5RRef.ID, "nuclear_reactor_core").setSecondaryOutputCover(COVER_REACTOR_OUTPUT_SECONDARY).removeFlags(EU).setTiers(NONE).addFlags(GUI, ITEM, FLUID, UNCULLED).renderContainedLiquids(false).custom().overlayTexture(Textures.REACTOR_CORE_OVERLAY_HANDLER).baseTexture(Textures.REACTOR_CORE_BASE_HANDLER).modelLoader(GT5RModelManager.LOADER_REACTOR).setTile(BlockEntityNuclearReactorCore::new).blockColorHandler(Machines::getBlockColorNuclear).itemColorHandler((stack, block, i) -> i == 0 ? Lead.getRGB() : -1).frontCovers().allowFrontIO().setNoTextureRotation(true).setOutputCover(GT5RCovers.COVER_REACTOR_OUTPUT).covers(ICover.emptyFactory, ICover.emptyFactory, GT5RCovers.COVER_REACTOR_OUTPUT, GT5RCovers.COVER_REACTOR_OUTPUT_SECONDARY, ICover.emptyFactory, ICover.emptyFactory); - public static BasicMachine SMALL_HEAT_EXCHANGER = new SecondaryOutputMachine(GT5RRef.ID, "small_heat_exchanger").setSecondaryOutputCover(COVER_OUTPUT_SECONDARY).removeFlags(EU).covers(ICover.emptyFactory, ICover.emptyFactory, ICover.emptyFactory, COVEROUTPUT, COVER_OUTPUT_SECONDARY, ICover.emptyFactory).setTiers(NONE).baseTexture(new Texture(GT5RRef.ID, "block/machine/base/small_heat_exchanger")).setMap(HEAT_EXCHANGER).addFlags(GUI, ITEM, FLUID).setTile(BlockEntitySmallHeatExchanger::new).frontCovers().allowFrontIO(); + public static BasicMachine NUCLEAR_REACTOR_CORE = new SecondaryOutputMachine(GT5RRef.ID, "nuclear_reactor_core").setSecondaryOutputCover(GT5RCovers.COVER_REACTOR_OUTPUT_SECONDARY).removeFlags(EU).setTiers(NONE).addFlags(GUI, ITEM, FLUID, UNCULLED).renderContainedLiquids(false).custom().overlayTexture(Textures.REACTOR_CORE_OVERLAY_HANDLER).baseTexture(Textures.REACTOR_CORE_BASE_HANDLER).modelLoader(GT5RModelManager.LOADER_REACTOR).setTile(BlockEntityNuclearReactorCore::new).blockColorHandler(Machines::getBlockColorNuclear).itemColorHandler((stack, block, i) -> i == 0 ? Materials.Lead.getRGB() : -1).frontCovers().allowFrontIO().setNoTextureRotation(true).setOutputCover(GT5RCovers.COVER_REACTOR_OUTPUT).covers(ICover.emptyFactory, ICover.emptyFactory, GT5RCovers.COVER_REACTOR_OUTPUT, GT5RCovers.COVER_REACTOR_OUTPUT_SECONDARY, ICover.emptyFactory, ICover.emptyFactory); + public static BasicMachine SMALL_HEAT_EXCHANGER = new SecondaryOutputMachine(GT5RRef.ID, "small_heat_exchanger").setSecondaryOutputCover(GT5RCovers.COVER_OUTPUT_SECONDARY).removeFlags(EU).covers(ICover.emptyFactory, ICover.emptyFactory, ICover.emptyFactory, COVEROUTPUT, GT5RCovers.COVER_OUTPUT_SECONDARY, ICover.emptyFactory).setTiers(NONE).baseTexture(new Texture(GT5RRef.ID, "block/machine/base/small_heat_exchanger")).setMap(RecipeMaps.HEAT_EXCHANGER).addFlags(GUI, ITEM, FLUID).setTile(BlockEntitySmallHeatExchanger::new).frontCovers().allowFrontIO(); /** ** Multiblock Hatch Machines (Electrical Age) **/ public static MultiMachine ADVANCED_MINER = new MultiMachine(GT5RRef.ID, "advanced_miner").setTiers(LV).addFlags(GUI, ITEM, EU).setTile(BlockEntityAdvancedMiner::new).setTextureBlock(GT5RBlocks.CASING_SOLID_STEEL); - public static MultiMachine BLAST_FURNACE = new MultiMachine(GT5RRef.ID, "electric_blast_furnace").setTiers(LV).setMap(E_BLAST_FURNACE).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(11).setTile(BlockEntityElectricBlastFurnace::new).custom().setTextureBlock(GT5RBlocks.CASING_HEAT_PROOF); - public static MultiMachine COMBUSTION_ENGINE = new MultiMachine(GT5RRef.ID, "combustion_engine").setTiers(EV).setMap(COMBUSTION_FUELS).addFlags(GUI, FLUID, EU, GENERATOR).addStructureTooltip(13).setTile(BlockEntityCombustionEngine::new).custom().setTextureBlock(GT5RBlocks.CASING_TITANIUM); - public static MultiMachine CRACKING_UNIT = new MultiMachine(GT5RRef.ID, "cracking_unit").setTiers(HV).setMap(CRACKING).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(9).setTile(BlockEntityOilCrackingUnit::new).custom().setTextureBlock(GT5RBlocks.CASING_STAINLESS_STEEL); - public static MultiMachine DISTLLATION_TOWER = new MultiMachine(GT5RRef.ID, "distillation_tower").setTiers(HV).setMap(DISTILLATION).addStructureTooltip(8).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityDistillationTower::new).custom().setTextureBlock(GT5RBlocks.CASING_STAINLESS_STEEL); - public static MultiMachine CRYO_DISTLLATION_TOWER = new MultiMachine(GT5RRef.ID, "cryo_distillation_tower").setTiers(HV).setMap(CRYO_DISTILLATION).addStructureTooltip(8).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityDistillationTower::new).custom().setTextureBlock(GT5RBlocks.CASING_FROST_PROOF); - public static MultiMachine FUSION_REACTOR = new MultiMachine(GT5RRef.ID, "fusion_control_computer").setTiers(LUV).setMap(FUSION).addFlags(GUI, FLUID, ITEM, EU).addStructureTooltip(7).setTile(BlockEntityFusionReactor::new).setTextureBlock(GT5RBlocks.CASING_FUSION); + public static MultiMachine BLAST_FURNACE = new MultiMachine(GT5RRef.ID, "electric_blast_furnace").setTiers(LV).setMap(RecipeMaps.E_BLAST_FURNACE).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(11).setTile(BlockEntityElectricBlastFurnace::new).custom().setTextureBlock(GT5RBlocks.CASING_HEAT_PROOF); + public static MultiMachine COMBUSTION_ENGINE = new MultiMachine(GT5RRef.ID, "combustion_engine").setTiers(EV).setMap(RecipeMaps.COMBUSTION_FUELS).addFlags(GUI, FLUID, EU, GENERATOR).addStructureTooltip(13).setTile(BlockEntityCombustionEngine::new).custom().setTextureBlock(GT5RBlocks.CASING_TITANIUM); + public static MultiMachine CRACKING_UNIT = new MultiMachine(GT5RRef.ID, "cracking_unit").setTiers(HV).setMap(RecipeMaps.CRACKING).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(9).setTile(BlockEntityOilCrackingUnit::new).custom().setTextureBlock(GT5RBlocks.CASING_STAINLESS_STEEL); + public static MultiMachine DISTLLATION_TOWER = new MultiMachine(GT5RRef.ID, "distillation_tower").setTiers(HV).setMap(RecipeMaps.DISTILLATION).addStructureTooltip(8).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityDistillationTower::new).custom().setTextureBlock(GT5RBlocks.CASING_STAINLESS_STEEL); + public static MultiMachine CRYO_DISTLLATION_TOWER = new MultiMachine(GT5RRef.ID, "cryo_distillation_tower").setTiers(HV).setMap(RecipeMaps.CRYO_DISTILLATION).addStructureTooltip(8).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityDistillationTower::new).custom().setTextureBlock(GT5RBlocks.CASING_FROST_PROOF); + public static MultiMachine FUSION_REACTOR = new MultiMachine(GT5RRef.ID, "fusion_control_computer").setTiers(LUV).setMap(RecipeMaps.FUSION).addFlags(GUI, FLUID, ITEM, EU).addStructureTooltip(7).setTile(BlockEntityFusionReactor::new).setTextureBlock(GT5RBlocks.CASING_FUSION); public static MultiMachine LARGE_HEAT_EXCHANGER = new MultiMachine(GT5RRef.ID, "large_heat_exchanger").setTiers(NONE).setMap(RecipeMaps.HEAT_EXCHANGER).addFlags(GUI, FLUID, ITEM, EU).addStructureTooltip(7).setTile(BlockEntityLargeHeatExchanger::new).custom().setTextureBlock(GT5RBlocks.CASING_TITANIUM); public static MultiMachine IMPLOSION_COMPRESSOR = new MultiMachine(GT5RRef.ID, "implosion_compressor").setTiers(HV).setMap(RecipeMaps.IMPLOSION_COMPRESSOR).addFlags(GUI, ITEM, EU).addStructureTooltip(7).setTile(BlockEntityImplosionCompressor::new).setTextureBlock(GT5RBlocks.CASING_SOLID_STEEL); public static MultiMachine LARGE_AUTOCLAVE = new MultiMachine(GT5RRef.ID, "large_autoclave").setTiers(HV).setMap(RecipeMaps.AUTOCLAVE).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(9).setTile(BlockEntityLargeAutoclave::new).setTextureBlock(GT5RBlocks.CASING_STAINLESS_STEEL); - public static MultiMachine LARGE_BATHING_VAT = new MultiMachine(GT5RRef.ID, "large_bathing_vat").setTiers(NONE).setMap(RecipeMaps.BATH).addFlags(GUI, ITEM, FLUID).addStructureTooltip(8).setTile(BlockEntityLargeBath::new).setTextureBlock(GT5RBlocks.STAINLESS_STEEL_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? StainlessSteel.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? StainlessSteel.getRGB() : -1); - public static MultiMachine LARGE_BOILER = new MultiMachine(GT5RRef.ID, "large_boiler").setTiers(LV, MV, HV, EV).addFlags(GUI, ITEM, FLUID).setMap(LARGE_BOILERS).setTile(BlockEntityLargeBoiler::new).custom().setTierSpecificLang().addStructureTooltip(13, (machine, stack, world, flag, i) -> { + public static MultiMachine LARGE_BATHING_VAT = new MultiMachine(GT5RRef.ID, "large_bathing_vat").setTiers(NONE).setMap(RecipeMaps.BATH).addFlags(GUI, ITEM, FLUID).addStructureTooltip(8).setTile(BlockEntityLargeBath::new).setTextureBlock(GT5RBlocks.STAINLESS_STEEL_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? Materials.StainlessSteel.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? Materials.StainlessSteel.getRGB() : -1); + public static MultiMachine LARGE_BOILER = new MultiMachine(GT5RRef.ID, "large_boiler").setTiers(LV, MV, HV, EV).addFlags(GUI, ITEM, FLUID).setMap(RecipeMaps.LARGE_BOILERS).setTile(BlockEntityLargeBoiler::new).custom().setTierSpecificLang().addStructureTooltip(13, (machine, stack, world, flag, i) -> { if (i == 1){ double total = machine.getTier() == LV ? 32000 : machine.getTier() == MV ? 36000 : machine.getTier() == HV ? 41600 : 48000; double production = machine.getTier() == LV ? 16000 : machine.getTier() == MV ? 24000 : machine.getTier() == HV ? 32000 : 40000; @@ -244,9 +243,9 @@ public class Machines { public static MultiMachine LARGE_CENTRIFUGE = new MultiMachine(GT5RRef.ID, "large_centrifuge").setTiers(HV).setMap(RecipeMaps.CENTRIFUGE).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(7).setTile(BlockEntityLargeCentrifuge::new).setTextureBlock(GT5RBlocks.CASING_TUNGSTENSTEEL); public static MultiMachine LARGE_CHEMICAL_REACTOR = new MultiMachine(GT5RRef.ID, "large_chemical_reactor").setTiers(HV).setMap(RecipeMaps.CHEMICAL_REACTOR).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(10).setTile(BlockEntityLargeChemicalReactor::new).custom().setTextureBlock(GT5RBlocks.CASING_CHEMICALLY_INERT); public static MultiMachine LARGE_ELECTROLYZER = new MultiMachine(GT5RRef.ID, "large_electrolyzer").setTiers(HV).setMap(RecipeMaps.ELECTROLYZER).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(9).setTile(BlockEntityLargeElectrolyzer::new).setTextureBlock(GT5RBlocks.CASING_STAINLESS_STEEL); - public static MultiMachine LARGE_PULVERIZER = new MultiMachine(GT5RRef.ID, "large_pulverizer").setTiers(HV).setMap(PULVERIZER).addFlags(GUI, ITEM, EU).addStructureTooltip(8).setTile(BlockEntityLargeMacerator::new).setTextureBlock(GT5RBlocks.TUNGSTENSTEEL_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? TungstenSteel.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? TungstenSteel.getRGB() : -1); - public static MultiMachine LARGE_ORE_WASHER = new MultiMachine(GT5RRef.ID, "large_ore_washer").setTiers(EV).setMap(RecipeMaps.ORE_WASHER).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityLargeOreWasher::new).setTextureBlock(GT5RBlocks.TITANIUM_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? Titanium.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? Titanium.getRGB() : -1); - public static MultiMachine LARGE_TURBINE = new MultiMachine(GT5RRef.ID, "large_turbine").setTiers(HV, EV, IV).setMap(STEAM_FUELS, HV).setMap(HP_STEAM_FUELS, IV).setMap(GAS_FUELS, EV).addFlags(GUI, ITEM, FLUID, EU, GENERATOR).setTile(BlockEntityLargeTurbine::new).custom(Textures.TURBINE).setTierSpecificLang().addStructureTooltip(8, (machine, stack, world, flag, i) -> { + public static MultiMachine LARGE_PULVERIZER = new MultiMachine(GT5RRef.ID, "large_pulverizer").setTiers(HV).setMap(RecipeMaps.PULVERIZER).addFlags(GUI, ITEM, EU).addStructureTooltip(8).setTile(BlockEntityLargeMacerator::new).setTextureBlock(GT5RBlocks.TUNGSTENSTEEL_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? Materials.TungstenSteel.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? Materials.TungstenSteel.getRGB() : -1); + public static MultiMachine LARGE_ORE_WASHER = new MultiMachine(GT5RRef.ID, "large_ore_washer").setTiers(EV).setMap(RecipeMaps.ORE_WASHER).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityLargeOreWasher::new).setTextureBlock(GT5RBlocks.TITANIUM_WALL).blockColorHandler((state, world, pos, machine, i) -> i == 0 ? Materials.Titanium.getRGB() : -1).itemColorHandler((stack, block, i) -> i == 0 ? Materials.Titanium.getRGB() : -1); + public static MultiMachine LARGE_TURBINE = new MultiMachine(GT5RRef.ID, "large_turbine").setTiers(HV, EV, IV).setMap(RecipeMaps.STEAM_FUELS, HV).setMap(RecipeMaps.HP_STEAM_FUELS, IV).setMap(RecipeMaps.GAS_FUELS, EV).addFlags(GUI, ITEM, FLUID, EU, GENERATOR).setTile(BlockEntityLargeTurbine::new).custom(Textures.TURBINE).setTierSpecificLang().addStructureTooltip(8, (machine, stack, world, flag, i) -> { if (i == 0){ return new Object[]{machine.getDisplayName(new ItemStack(machine))}; } @@ -260,7 +259,7 @@ public class Machines { } return new Object[0]; }); - public static MultiMachine MULTI_SMELTER = new MultiMachine(GT5RRef.ID, "multi_smelter").setTiers(HV).setMap(ELECTRIC_FURNACE).addFlags(GUI, ITEM, EU).addStructureTooltip(9).setTile(BlockEntityMultiSmelter::new).custom().setTextureBlock(GT5RBlocks.CASING_HEAT_PROOF); + public static MultiMachine MULTI_SMELTER = new MultiMachine(GT5RRef.ID, "multi_smelter").setTiers(HV).setMap(RecipeMaps.ELECTRIC_FURNACE).addFlags(GUI, ITEM, EU).addStructureTooltip(9).setTile(BlockEntityMultiSmelter::new).custom().setTextureBlock(GT5RBlocks.CASING_HEAT_PROOF); public static MultiMachine OIL_DRILLING_RIG = new MultiMachine(GT5RRef.ID, "oil_drilling_rig").setTiers(MV).addFlags(GUI, ITEM, FLUID, EU).addStructureTooltip(9).setTile(BlockEntityOilDrillingRig::new).custom().setTextureBlock(GT5RBlocks.CASING_SOLID_STEEL); public static MultiMachine PROCESSING_ARRAY = new MultiMachine(GT5RRef.ID, "processing_array").setTiers(EV).addFlags(GUI, ITEM, FLUID, EU, RECIPE).addStructureTooltip(8).setTile(BlockEntityProcessingArray::new).custom().setTextureBlock(GT5RBlocks.CASING_TUNGSTENSTEEL); public static MultiMachine PYROLYSIS_OVEN = new MultiMachine(GT5RRef.ID, "pyrolysis_oven").setTiers(MV).setMap(RecipeMaps.PYROLYSIS_OVEN).addFlags(GUI, ITEM, FLUID, EU).setTile(BlockEntityPyrolysisOven::new).custom().setTextureBlock(GT5RBlocks.CASING_ULV); @@ -276,8 +275,8 @@ public class Machines { /** ** Hatches **/ - public static HatchMachine DYNAMO_HATCH = new HatchMachine(GT5RRef.ID, "dynamo_hatch", COVER_DYNAMO_COLORED, "dynamo").addFlags(EU).overlayTexture(Textures.HATCH_OVERLAY_HANDLER); - public static HatchMachine ENERGY_HATCH = new HatchMachine(GT5RRef.ID, "energy_hatch", COVER_ENERGY_COLORED, "energy").addFlags(EU).overlayTexture(Textures.HATCH_OVERLAY_HANDLER); + public static HatchMachine DYNAMO_HATCH = new HatchMachine(GT5RRef.ID, "dynamo_hatch", GT5RCovers.COVER_DYNAMO_COLORED, "dynamo").addFlags(EU).overlayTexture(Textures.HATCH_OVERLAY_HANDLER); + public static HatchMachine ENERGY_HATCH = new HatchMachine(GT5RRef.ID, "energy_hatch", GT5RCovers.COVER_ENERGY_COLORED, "energy").addFlags(EU).overlayTexture(Textures.HATCH_OVERLAY_HANDLER); public static HatchMachine INPUT_HATCH = new HatchMachine(GT5RRef.ID, "input_hatch", COVERINPUT, "fluid_input").addFlags(GUI, FLUID, CELL).setTile(BlockEntityInputHatch::new); public static HatchMachine OUTPUT_HATCH = new HatchMachine(GT5RRef.ID, "output_hatch", COVEROUTPUT, "fluid_output").addFlags(GUI, FLUID, CELL); public static HatchMachine INPUT_BUS = new HatchMachine(GT5RRef.ID, "input_bus", COVERINPUT, "item_input").setTiers(ULV, LV, MV, HV, EV).addFlags(GUI, ITEM).setTile(BlockEntityInputBus::new); @@ -312,7 +311,7 @@ private static MultiblockTankMachine[] createTankMachine(Material material, int new MultiblockTankMachine(GT5RRef.ID, material, true, 432 * multiplier * 1000), new MultiblockTankMachine(GT5RRef.ID, material, false, 2000 * multiplier * 1000) }; - if (material == StainlessSteel || material == Netherite){ + if (material == Materials.StainlessSteel || material == Netherite){ multiblockTankMachines[0].acidProof(); multiblockTankMachines[1].acidProof(); } @@ -328,7 +327,7 @@ private static int getBlockColorNuclear(BlockState state, @Nullable BlockGetter if (machine instanceof BlockEntityNuclearReactorCore core){ if (i < 5){ boolean on = core.getMachineState() == MachineState.ACTIVE && (core.mode & Ref.B[slot]) == 0; - return on ? -1 : Lead.getRGB(); + return on ? -1 : Materials.Lead.getRGB(); } else { ItemStack rod = core.getRod(slot); if (!rod.isEmpty() && rod.getItem() instanceof IItemReactorRod reactorRod){ @@ -337,7 +336,7 @@ private static int getBlockColorNuclear(BlockState state, @Nullable BlockGetter } } } - if (i == 0) return Lead.getRGB(); + if (i == 0) return Materials.Lead.getRGB(); return -1; } } diff --git a/common/src/main/java/muramasa/gregtech/data/Materials.java b/common/src/main/java/org/gtreimagined/gt5r/data/Materials.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/data/Materials.java rename to common/src/main/java/org/gtreimagined/gt5r/data/Materials.java index b290879cc..5b0a88d72 100644 --- a/common/src/main/java/muramasa/gregtech/data/Materials.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/Materials.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.material.Material; -import muramasa.gregtech.GT5RRef; import net.minecraft.world.item.DyeColor; import org.gtreimagined.gtcore.GTCore; import org.gtreimagined.gtcore.data.GTCoreMaterials; diff --git a/common/src/main/java/muramasa/gregtech/data/MenuHandlers.java b/common/src/main/java/org/gtreimagined/gt5r/data/MenuHandlers.java similarity index 88% rename from common/src/main/java/muramasa/gregtech/data/MenuHandlers.java rename to common/src/main/java/org/gtreimagined/gt5r/data/MenuHandlers.java index 7d6f1f7fc..3145d65b7 100644 --- a/common/src/main/java/muramasa/gregtech/data/MenuHandlers.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/MenuHandlers.java @@ -1,12 +1,12 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.multi.BlockEntityFusionReactor; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.blockentity.multi.BlockEntityMultiMachine; import muramasa.antimatter.capability.IGuiHandler; import muramasa.antimatter.gui.MenuHandlerMachine; import muramasa.antimatter.gui.container.ContainerMultiMachine; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.multi.BlockEntityFusionReactor; import net.minecraft.world.entity.player.Inventory; public class MenuHandlers { diff --git a/common/src/main/java/muramasa/gregtech/data/Models.java b/common/src/main/java/org/gtreimagined/gt5r/data/Models.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/data/Models.java rename to common/src/main/java/org/gtreimagined/gt5r/data/Models.java index fbade3f5f..24fedb44f 100644 --- a/common/src/main/java/muramasa/gregtech/data/Models.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/Models.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; public class Models { diff --git a/common/src/main/java/muramasa/gregtech/data/RecipeMaps.java b/common/src/main/java/org/gtreimagined/gt5r/data/RecipeMaps.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/data/RecipeMaps.java rename to common/src/main/java/org/gtreimagined/gt5r/data/RecipeMaps.java index 537419a6d..134222588 100644 --- a/common/src/main/java/muramasa/gregtech/data/RecipeMaps.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/RecipeMaps.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.GT5RRef; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.integration.jeirei.renderer.IRecipeInfoRenderer; @@ -14,7 +15,6 @@ import muramasa.antimatter.recipe.map.Proxy; import muramasa.antimatter.recipe.map.RecipeBuilder; import muramasa.antimatter.recipe.map.RecipeMap; -import muramasa.gregtech.GT5RRef; import net.minecraft.client.gui.Font; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; @@ -29,8 +29,6 @@ import java.util.List; import java.util.function.BiFunction; -import static muramasa.gregtech.data.Guis.*; - @SuppressWarnings("unchecked") public class RecipeMaps { @@ -95,21 +93,21 @@ public class RecipeMaps { public static RecipeMap CUTTER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "cutter", new RecipeBuilder())); public static RecipeMap CRACKING = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "cracking", new RecipeBuilder())).setGuiData(MULTI_DISPLAY); + new RecipeMap<>(GT5RRef.ID, "cracking", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY); public static RecipeMap ASSEMBLY_LINE = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "assembly_line", new RecipeBuilder())).setGuiData(MULTI_DISPLAY_FLUID); + new RecipeMap<>(GT5RRef.ID, "assembly_line", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY_FLUID); public static RecipeMap DEHYDRATOR = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "dehydrator", new RecipeBuilder())); public static RecipeMap DISASSEMBLER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "disassembler", new RecipeBuilder())).setProxy(DISSASSEMBLER_PROXY.apply(8, 200)); public static RecipeMap DISTILLATION = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "distillation", new RecipeBuilder())).setGuiData(MULTI_DISPLAY_FLUID); + new RecipeMap<>(GT5RRef.ID, "distillation", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY_FLUID); public static RecipeMap CRYO_DISTILLATION = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "cryo_distillation", new RecipeBuilder())).setGuiData(MULTI_DISPLAY_FLUID); + new RecipeMap<>(GT5RRef.ID, "cryo_distillation", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY_FLUID); public static RecipeMap DISTILLERY = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "distillery", new RecipeBuilder())); public static RecipeMap E_BLAST_FURNACE = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "electric_blast_furnace", new RecipeBuilders.BlastingBuilder())).setGuiData(MULTI_DISPLAY); + new RecipeMap<>(GT5RRef.ID, "electric_blast_furnace", new RecipeBuilders.BlastingBuilder())).setGuiData(Guis.MULTI_DISPLAY); public static RecipeMap ELECTRIC_FURNACE = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "electric_furnace", new RecipeBuilder()) .setProxy(RecipeProxies.FURNACE_PROXY.apply(8, 60))); @@ -135,17 +133,17 @@ public class RecipeMaps { public static RecipeMap FLUID_SOLIDIFYER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "fluid_solidifyer", new RecipeBuilder())); public static RecipeMap FUSION = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "fusion", new RecipeBuilder())).setGuiData(MULTI_DISPLAY); + new RecipeMap<>(GT5RRef.ID, "fusion", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY); public static RecipeMap GAS_FUELS = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "gas_fuels", new RecipeBuilder())); public static RecipeMap FORGE_HAMMER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "forge_hammer", new SteamBuilder(STEAM_FORGE_HAMMER))); public static RecipeMap HEAT_EXCHANGER = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "heat_exchanger", new RecipeBuilder())).setGuiData(MULTI_DISPLAY); + new RecipeMap<>(GT5RRef.ID, "heat_exchanger", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY); public static RecipeMap IMPLOSION_COMPRESSOR = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "implosion_compressor", new RecipeBuilder())).setGuiData(MULTI_DISPLAY); + new RecipeMap<>(GT5RRef.ID, "implosion_compressor", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY); public static RecipeMap LARGE_BOILERS = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "large_boilers", new RecipeBuilder())).setGuiData(MULTI_DISPLAY); + new RecipeMap<>(GT5RRef.ID, "large_boilers", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY); public static RecipeMap LASER_ENGRAVER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "laser_engraver", new RecipeBuilder())); public static RecipeMap LATHE = AntimatterAPI.register(RecipeMap.class, @@ -175,7 +173,7 @@ public class RecipeMaps { public static RecipeMap PRINTING = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "printing", new RecipeBuilder())); public static RecipeMap PYROLYSIS_OVEN = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "pyrolysis_oven", new RecipeBuilder())).setGuiData(MULTI_DISPLAY); + new RecipeMap<>(GT5RRef.ID, "pyrolysis_oven", new RecipeBuilder())).setGuiData(Guis.MULTI_DISPLAY); public static RecipeMap ROASTER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "roaster", new RecipeBuilder())); @@ -203,7 +201,7 @@ public class RecipeMaps { public static RecipeMap UNPACKAGER = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "unpackager", new RecipeBuilder())); public static RecipeMap VACUUM_FREEZER = AntimatterAPI.register(RecipeMap.class, - new RecipeMap<>(GT5RRef.ID, "vacuum_freezer", new RecipeBuilder()).setGuiData(MULTI_DISPLAY)); + new RecipeMap<>(GT5RRef.ID, "vacuum_freezer", new RecipeBuilder()).setGuiData(Guis.MULTI_DISPLAY)); public static RecipeMap WIRE_MILL = AntimatterAPI.register(RecipeMap.class, new RecipeMap<>(GT5RRef.ID, "wire_mill", new RecipeBuilder())); @@ -354,19 +352,19 @@ public int getRows() { }; static { - SOLID_FUEL_BOILERS.setGuiData(SIMPLE_DISPLAY); + SOLID_FUEL_BOILERS.setGuiData(Guis.SIMPLE_DISPLAY); COMBUSTION_FUELS.setGuiData(Guis.MULTI_DISPLAY); GAS_FUELS.setGuiData(Guis.MULTI_DISPLAY); - SEMI_FUELS.setGuiData(MULTI_DISPLAY); + SEMI_FUELS.setGuiData(Guis.MULTI_DISPLAY); NAQUADAH_FUELS.setGuiData(Guis.MULTI_DISPLAY); ORE_BYPRODUCTS.setGuiData(Guis.ORE_BYPRODUCTS); PLASMA_FUELS.setGuiData(Guis.MULTI_DISPLAY); // SMELTING.setGuiData(Guis.MULTI_DISPLAY_COMPACT); STEAM_FUELS.setGuiData(Guis.MULTI_DISPLAY); - HP_STEAM_FUELS.setGuiData(MULTI_DISPLAY); - TREE_GROWTH_SIMULATOR.setGuiData(MULTI_DISPLAY); - DISTILLATION.setGuiData(MULTI_DISPLAY_DISTILLATION); - CRYO_DISTILLATION.setGuiData(MULTI_DISPLAY_DISTILLATION); + HP_STEAM_FUELS.setGuiData(Guis.MULTI_DISPLAY); + TREE_GROWTH_SIMULATOR.setGuiData(Guis.MULTI_DISPLAY); + DISTILLATION.setGuiData(Guis.MULTI_DISPLAY_DISTILLATION); + CRYO_DISTILLATION.setGuiData(Guis.MULTI_DISPLAY_DISTILLATION); } public static void clientMaps() { diff --git a/common/src/main/java/muramasa/gregtech/data/StructureInfo.java b/common/src/main/java/org/gtreimagined/gt5r/data/StructureInfo.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/data/StructureInfo.java rename to common/src/main/java/org/gtreimagined/gt5r/data/StructureInfo.java index f00fb1bf9..2a59b5dfa 100644 --- a/common/src/main/java/muramasa/gregtech/data/StructureInfo.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/StructureInfo.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import muramasa.antimatter.structure.PatternBuilder; import net.minecraft.core.Direction; import net.minecraft.world.level.block.Blocks; -import static muramasa.gregtech.data.Machines.*; +import static org.gtreimagined.gt5r.data.Machines.*; public class StructureInfo { diff --git a/common/src/main/java/muramasa/gregtech/data/Structures.java b/common/src/main/java/org/gtreimagined/gt5r/data/Structures.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/data/Structures.java rename to common/src/main/java/org/gtreimagined/gt5r/data/Structures.java index 8f57bf44a..93cff2e01 100644 --- a/common/src/main/java/muramasa/gregtech/data/Structures.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/Structures.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import com.gtnewhorizon.structurelib.structure.IStructureElement; import com.gtnewhorizon.structurelib.structure.StructureUtility; import muramasa.antimatter.structure.FakeTileElement; import muramasa.antimatter.util.int3; -import muramasa.gregtech.block.BlockCoil; -import muramasa.gregtech.blockentity.multi.*; +import org.gtreimagined.gt5r.block.BlockCoil; +import muramasa.gt5r.blockentity.multi.*; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.world.item.ItemStack; @@ -14,6 +14,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import org.gtreimagined.gt5r.blockentity.multi.*; import java.util.function.BiConsumer; import java.util.function.BiPredicate; @@ -26,16 +27,14 @@ import static muramasa.antimatter.machine.Tier.LUV; import static muramasa.antimatter.structure.AntimatterStructureUtility.ofHatch; import static muramasa.antimatter.structure.AntimatterStructureUtility.ofHatchMinTier; -import static muramasa.gregtech.data.Machines.*; -import static muramasa.gregtech.data.Materials.Lithium; -import static muramasa.gregtech.data.Materials.Steel; +import static org.gtreimagined.gt5r.data.Machines.*; public class Structures { /** Special Case Elements **/ public static IStructureElement AIR_OR_LAVA = ofChain(StructureUtility.isAir(), StructureUtility.ofBlockAdder((w, b) -> b == Blocks.LAVA || b == GT5RBlocks.LAVA, Blocks.LAVA)); public static IStructureElement GLASS_BLOCK = ofBlock(Blocks.GLASS); - public static IStructureElement LITHIUM_BLOCK = ofBlock(BLOCK.getBlockMaterialTag(Lithium)); + public static IStructureElement LITHIUM_BLOCK = ofBlock(BLOCK.getBlockMaterialTag(Materials.Lithium)); public static final FakeTileElement FAKE_CASING = new FakeTileElement<>(GT5RBlocks.CASING_FIRE_BRICK); public static void init() { @@ -237,7 +236,7 @@ public static void init() { OIL_DRILLING_RIG.setStructure(BlockEntityOilDrillingRig.class, b -> b.part("main") .of(" ", " F ", " ").of(0).of(0).of(" F ", "FCF", " F ").of(3).of(3).of("H~H", "HCH", "HHH").build() - .at('F', FRAME.get().get(Steel).asBlock()).at('C', GT5RBlocks.CASING_SOLID_STEEL) + .at('F', FRAME.get().get(Materials.Steel).asBlock()).at('C', GT5RBlocks.CASING_SOLID_STEEL) .at('H', GT5RBlocks.CASING_SOLID_STEEL, ENERGY_HATCH, OUTPUT_HATCH, OUTPUT_BUS) .offset(1, 6, 0).min(1, OUTPUT_HATCH, ENERGY_HATCH).build()); diff --git a/common/src/main/java/muramasa/gregtech/data/Textures.java b/common/src/main/java/org/gtreimagined/gt5r/data/Textures.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/data/Textures.java rename to common/src/main/java/org/gtreimagined/gt5r/data/Textures.java index 59360062f..4e9f44f1d 100644 --- a/common/src/main/java/muramasa/gregtech/data/Textures.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/Textures.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.texture.IOverlayModeler; import muramasa.antimatter.texture.IOverlayTexturer; import muramasa.antimatter.texture.ITextureHandler; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/muramasa/gregtech/data/TierMaps.java b/common/src/main/java/org/gtreimagined/gt5r/data/TierMaps.java similarity index 86% rename from common/src/main/java/muramasa/gregtech/data/TierMaps.java rename to common/src/main/java/org/gtreimagined/gt5r/data/TierMaps.java index 1bdf44f04..b62d34122 100644 --- a/common/src/main/java/muramasa/gregtech/data/TierMaps.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/TierMaps.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.material.Material; @@ -8,8 +10,6 @@ import muramasa.antimatter.pipe.PipeItemBlock; import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.GT5RRef; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -24,7 +24,6 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.GEM; import static muramasa.antimatter.data.AntimatterMaterials.Copper; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.Materials.*; public class TierMaps { @@ -48,27 +47,27 @@ public class TierMaps { static { { ImmutableMap.Builder builder = ImmutableMap.builder(); - builder.put(Tier.ULV, WroughtIron); - builder.put(Tier.LV, Steel); - builder.put(Tier.MV, Aluminium); - builder.put(Tier.HV, StainlessSteel); - builder.put(Tier.EV, Titanium); - builder.put(Tier.IV, TungstenSteel); - builder.put(LUV, Chromium); - builder.put(ZPM, Iridium); - builder.put(UV, Osmium); - builder.put(UHV, Neutronium); + builder.put(Tier.ULV, Materials.WroughtIron); + builder.put(Tier.LV, Materials.Steel); + builder.put(Tier.MV, Materials.Aluminium); + builder.put(Tier.HV, Materials.StainlessSteel); + builder.put(Tier.EV, Materials.Titanium); + builder.put(Tier.IV, Materials.TungstenSteel); + builder.put(LUV, Materials.Chromium); + builder.put(ZPM, Materials.Iridium); + builder.put(UV, Materials.Osmium); + builder.put(UHV, Materials.Neutronium); TIER_MATERIALS = builder.build(); } { ImmutableMap.Builder builder = ImmutableMap.builder(); builder.put(Tier.ULV, Copper); - builder.put(Tier.LV, Bronze); - builder.put(Tier.MV, Steel); - builder.put(Tier.HV, StainlessSteel); - builder.put(Tier.EV, Titanium); - builder.put(Tier.IV, TungstenSteel); + builder.put(Tier.LV, Materials.Bronze); + builder.put(Tier.MV, Materials.Steel); + builder.put(Tier.HV, Materials.StainlessSteel); + builder.put(Tier.EV, Materials.Titanium); + builder.put(Tier.IV, Materials.TungstenSteel); TIER_PIPE_MATERIAL = builder.build(); } @@ -145,26 +144,26 @@ public static void providerInit() { }*/ { ImmutableMap.Builder builder = ImmutableMap.builder(); - builder.put(Tier.ULV, Bronze); - builder.put(Tier.LV, Tin); - builder.put(Tier.MV, Bronze); - builder.put(Tier.HV, Steel); - builder.put(Tier.EV, StainlessSteel); - builder.put(Tier.IV, TungstenSteel); + builder.put(Tier.ULV, Materials.Bronze); + builder.put(Tier.LV, Materials.Tin); + builder.put(Tier.MV, Materials.Bronze); + builder.put(Tier.HV, Materials.Steel); + builder.put(Tier.EV, Materials.StainlessSteel); + builder.put(Tier.IV, Materials.TungstenSteel); TIER_ROTORS = builder.build(); } { ImmutableMap.Builder builder = ImmutableMap.builder(); - builder.put(Tier.LV, Brass); - builder.put(Tier.MV, Electrum); - builder.put(Tier.HV, Chromium); - builder.put(Tier.EV, Platinum); - builder.put(Tier.IV, Osmium); + builder.put(Tier.LV, Materials.Brass); + builder.put(Tier.MV, Materials.Electrum); + builder.put(Tier.HV, Materials.Chromium); + builder.put(Tier.EV, Materials.Platinum); + builder.put(Tier.IV, Materials.Osmium); EMITTER_RODS = builder.build(); } { ImmutableMap.Builder builder = ImmutableMap.builder(); - builder.put(Tier.LV, GEM.getMaterialTag(MilkyQuartz)); + builder.put(Tier.LV, GEM.getMaterialTag(Materials.MilkyQuartz)); builder.put(Tier.MV, Items.QUARTZ); builder.put(Tier.HV, Items.EMERALD); builder.put(Tier.EV, Items.ENDER_PEARL); diff --git a/common/src/main/java/muramasa/gregtech/data/ToolTypes.java b/common/src/main/java/org/gtreimagined/gt5r/data/ToolTypes.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/data/ToolTypes.java rename to common/src/main/java/org/gtreimagined/gt5r/data/ToolTypes.java index a1f7dddc2..35dc8ed2d 100644 --- a/common/src/main/java/muramasa/gregtech/data/ToolTypes.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/ToolTypes.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.data; +package org.gtreimagined.gt5r.data; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntitySecondaryOutput; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterDefaultTools; @@ -13,10 +15,8 @@ import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.tool.IAntimatterTool; import muramasa.antimatter.tool.behaviour.BehaviourExtendedHighlight; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntitySecondaryOutput; -import muramasa.gregtech.items.ItemPortableScanner; -import muramasa.gregtech.items.ItemTurbineRotor; +import org.gtreimagined.gt5r.items.ItemPortableScanner; +import org.gtreimagined.gt5r.items.ItemTurbineRotor; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/muramasa/gregtech/datagen/GT5RBlockLootProvider.java b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RBlockLootProvider.java similarity index 85% rename from common/src/main/java/muramasa/gregtech/datagen/GT5RBlockLootProvider.java rename to common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RBlockLootProvider.java index 07567e064..8101296ad 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GT5RBlockLootProvider.java +++ b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RBlockLootProvider.java @@ -1,19 +1,28 @@ -package muramasa.gregtech.datagen; +package org.gtreimagined.gt5r.datagen; +import gtreimagined.gt5r.block.*; +import org.gtreimagined.gt5r.block.BlockAsphalt; +import org.gtreimagined.gt5r.block.BlockAsphaltSlab; +import org.gtreimagined.gt5r.block.BlockAsphaltStair; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.block.BlockCoil; +import org.gtreimagined.gt5r.block.BlockColoredWall; +import org.gtreimagined.gt5r.block.BlockFakeCasing; +import org.gtreimagined.gt5r.integration.AppliedEnergisticsRegistrar; +import org.gtreimagined.gt5r.integration.SpaceModRegistrar; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterStoneTypes; import muramasa.antimatter.datagen.providers.AntimatterBlockLootProvider; import muramasa.antimatter.ore.CobbleStoneType; -import muramasa.gregtech.block.*; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.Materials; -import muramasa.gregtech.integration.AppliedEnergisticsRegistrar; -import muramasa.gregtech.integration.SpaceModRegistrar; +import muramasa.gt5r.block.*; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.data.loot.BlockLoot; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; +import org.gtreimagined.block.*; import static muramasa.antimatter.data.AntimatterMaterialTypes.RAW_ORE; import static muramasa.antimatter.data.AntimatterMaterials.*; diff --git a/common/src/main/java/muramasa/gregtech/datagen/GT5RBlockTagProvider.java b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RBlockTagProvider.java similarity index 79% rename from common/src/main/java/muramasa/gregtech/datagen/GT5RBlockTagProvider.java rename to common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RBlockTagProvider.java index bc0612423..59c0f998c 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GT5RBlockTagProvider.java +++ b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RBlockTagProvider.java @@ -1,15 +1,24 @@ -package muramasa.gregtech.datagen; +package org.gtreimagined.gt5r.datagen; +import gtreimagined.gt5r.block.*; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.block.*; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.GT5RTags; -import muramasa.gregtech.data.Machines; +import org.gtreimagined.gt5r.GT5RRef; +import muramasa.gt5r.block.*; +import org.gtreimagined.gt5r.block.BlockAsphalt; +import org.gtreimagined.gt5r.block.BlockAsphaltSlab; +import org.gtreimagined.gt5r.block.BlockAsphaltStair; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.block.BlockCoil; +import org.gtreimagined.gt5r.block.BlockColoredWall; +import org.gtreimagined.gt5r.block.BlockFakeCasing; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RTags; +import org.gtreimagined.gt5r.data.Machines; import net.minecraft.tags.BlockTags; +import org.gtreimagined.block.*; import static muramasa.antimatter.data.AntimatterMaterials.Wood; diff --git a/common/src/main/java/muramasa/gregtech/datagen/GT5RFluidTagProvider.java b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RFluidTagProvider.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/datagen/GT5RFluidTagProvider.java rename to common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RFluidTagProvider.java index 93fcb9eb4..e83b8163e 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GT5RFluidTagProvider.java +++ b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RFluidTagProvider.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.datagen; +package org.gtreimagined.gt5r.datagen; import muramasa.antimatter.datagen.providers.AntimatterFluidTagProvider; import muramasa.antimatter.material.Material; @@ -6,7 +6,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; -import static muramasa.gregtech.data.Materials.Oil; +import static org.gtreimagined.gt5r.data.Materials.Oil; public class GT5RFluidTagProvider extends AntimatterFluidTagProvider { public GT5RFluidTagProvider(String providerDomain, String providerName, boolean replace) { diff --git a/common/src/main/java/muramasa/gregtech/datagen/GT5RItemTagProvider.java b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RItemTagProvider.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/datagen/GT5RItemTagProvider.java rename to common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RItemTagProvider.java index 790ba2628..8cc3e0231 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GT5RItemTagProvider.java +++ b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RItemTagProvider.java @@ -1,18 +1,18 @@ -package muramasa.gregtech.datagen; +package org.gtreimagined.gt5r.datagen; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.ForgeCTags; import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider; import muramasa.antimatter.datagen.providers.AntimatterItemTagProvider; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.GT5RTags; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RTags; import net.minecraft.world.item.Items; import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; import static org.gtreimagined.gtcore.data.GTCoreTags.*; public class GT5RItemTagProvider extends AntimatterItemTagProvider { diff --git a/common/src/main/java/muramasa/gregtech/datagen/GT5RLocalizations.java b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RLocalizations.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/datagen/GT5RLocalizations.java rename to common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RLocalizations.java index 5a789167d..4a80f612d 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GT5RLocalizations.java +++ b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RLocalizations.java @@ -1,23 +1,32 @@ -package muramasa.gregtech.datagen; +package org.gtreimagined.gt5r.datagen; +import gtreimagined.gt5r.block.*; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.datagen.providers.AntimatterLanguageProvider; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.block.*; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.GT5RCovers; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.items.ItemDepletedRod; -import muramasa.gregtech.items.ItemNuclearFuelRod; +import org.gtreimagined.gt5r.GT5RRef; +import muramasa.gt5r.block.*; +import org.gtreimagined.gt5r.block.BlockAsphalt; +import org.gtreimagined.gt5r.block.BlockAsphaltSlab; +import org.gtreimagined.gt5r.block.BlockAsphaltStair; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.block.BlockCoil; +import org.gtreimagined.gt5r.block.BlockColoredWall; +import org.gtreimagined.gt5r.block.BlockFakeCasing; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.items.ItemDepletedRod; +import org.gtreimagined.gt5r.items.ItemNuclearFuelRod; +import org.gtreimagined.block.*; import static muramasa.antimatter.machine.Tier.*; import static muramasa.antimatter.util.Utils.lowerUnderscoreToUpperSpaced; import static muramasa.antimatter.util.Utils.lowerUnderscoreToUpperSpacedRotated; -import static muramasa.gregtech.data.Machines.*; +import static org.gtreimagined.gt5r.data.Machines.*; public class GT5RLocalizations { diff --git a/common/src/main/java/muramasa/gregtech/datagen/GT5RTwilightStalctites.java b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RTwilightStalctites.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/datagen/GT5RTwilightStalctites.java rename to common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RTwilightStalctites.java index 330c5ff13..2d16e8c97 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/GT5RTwilightStalctites.java +++ b/common/src/main/java/org/gtreimagined/gt5r/datagen/GT5RTwilightStalctites.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.datagen; +package org.gtreimagined.gt5r.datagen; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -7,7 +7,7 @@ import muramasa.antimatter.Ref; import muramasa.antimatter.datagen.AntimatterDynamics; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5RRef; +import org.gtreimagined.gt5r.GT5RRef; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; diff --git a/common/src/main/java/muramasa/gregtech/datagen/MultiBlocks_tooltips_-_In_Progress.txt b/common/src/main/java/org/gtreimagined/gt5r/datagen/MultiBlocks_tooltips_-_In_Progress.txt similarity index 100% rename from common/src/main/java/muramasa/gregtech/datagen/MultiBlocks_tooltips_-_In_Progress.txt rename to common/src/main/java/org/gtreimagined/gt5r/datagen/MultiBlocks_tooltips_-_In_Progress.txt diff --git a/common/src/main/java/muramasa/gregtech/datagen/ProgressionAdvancements.java b/common/src/main/java/org/gtreimagined/gt5r/datagen/ProgressionAdvancements.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/datagen/ProgressionAdvancements.java rename to common/src/main/java/org/gtreimagined/gt5r/datagen/ProgressionAdvancements.java index a8d686b81..559ff02d1 100644 --- a/common/src/main/java/muramasa/gregtech/datagen/ProgressionAdvancements.java +++ b/common/src/main/java/org/gtreimagined/gt5r/datagen/ProgressionAdvancements.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.datagen; +package org.gtreimagined.gt5r.datagen; import muramasa.antimatter.Data; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.GT5RRef; +import org.gtreimagined.gt5r.GT5RRef; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.FrameType; import net.minecraft.advancements.critereon.InventoryChangeTrigger; @@ -25,8 +25,8 @@ import static muramasa.antimatter.util.TagUtils.getForgelikeItemTag; import static muramasa.antimatter.util.Utils.hasItem; import static muramasa.antimatter.util.Utils.hasItems; -import static muramasa.gregtech.data.Machines.*; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Machines.*; +import static org.gtreimagined.gt5r.data.Materials.*; public class ProgressionAdvancements implements Consumer> { diff --git a/common/src/main/java/muramasa/gregtech/gui/ButtonOverlays.java b/common/src/main/java/org/gtreimagined/gt5r/gui/ButtonOverlays.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/gui/ButtonOverlays.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/ButtonOverlays.java index 73505b364..085c86a10 100644 --- a/common/src/main/java/muramasa/gregtech/gui/ButtonOverlays.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/ButtonOverlays.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.gui; +package org.gtreimagined.gt5r.gui; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.gui.ButtonOverlay; -import muramasa.gregtech.GT5RRef; public class ButtonOverlays { public static ButtonOverlay BLACKLIST_OFF = new ButtonOverlay(GT5RRef.ID, "blacklist_off", 16, 16); diff --git a/common/src/main/java/muramasa/gregtech/gui/ScreenCoalBoiler.java b/common/src/main/java/org/gtreimagined/gt5r/gui/ScreenCoalBoiler.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/gui/ScreenCoalBoiler.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/ScreenCoalBoiler.java index 1c97dff96..adbc40140 100644 --- a/common/src/main/java/muramasa/gregtech/gui/ScreenCoalBoiler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/ScreenCoalBoiler.java @@ -1,14 +1,14 @@ -package muramasa.gregtech.gui; +package org.gtreimagined.gt5r.gui; import com.mojang.blaze3d.vertex.PoseStack; import earth.terrarium.botarium.common.fluid.base.FluidHolder; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityCoalBoiler; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.gui.container.ContainerMachine; import muramasa.antimatter.gui.screen.ScreenMachine; import muramasa.antimatter.integration.jeirei.AntimatterJEIREIPlugin; import muramasa.antimatter.machine.MachineFlag; -import muramasa.gregtech.blockentity.single.BlockEntityCoalBoiler; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; diff --git a/common/src/main/java/muramasa/gregtech/gui/ScreenFusionReactor.java b/common/src/main/java/org/gtreimagined/gt5r/gui/ScreenFusionReactor.java similarity index 85% rename from common/src/main/java/muramasa/gregtech/gui/ScreenFusionReactor.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/ScreenFusionReactor.java index 3e5c765ae..912bd0353 100644 --- a/common/src/main/java/muramasa/gregtech/gui/ScreenFusionReactor.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/ScreenFusionReactor.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.gui; +package org.gtreimagined.gt5r.gui; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.blockentity.multi.BlockEntityFusionReactor; import muramasa.antimatter.gui.container.ContainerMultiMachine; import muramasa.antimatter.gui.screen.ScreenMultiMachine; -import muramasa.gregtech.blockentity.multi.BlockEntityFusionReactor; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/common/src/main/java/muramasa/gregtech/gui/ScreenSteamMachine.java b/common/src/main/java/org/gtreimagined/gt5r/gui/ScreenSteamMachine.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/gui/ScreenSteamMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/ScreenSteamMachine.java index 82de2974e..00a6356a4 100644 --- a/common/src/main/java/muramasa/gregtech/gui/ScreenSteamMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/ScreenSteamMachine.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.gui; +package org.gtreimagined.gt5r.gui; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.blockentity.single.BlockEntitySteamMachine; import muramasa.antimatter.gui.container.ContainerBasicMachine; import muramasa.antimatter.gui.screen.ScreenMachine; -import muramasa.gregtech.blockentity.single.BlockEntitySteamMachine; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; diff --git a/common/src/main/java/muramasa/gregtech/gui/widgets/CoalBoilerFuelWidget.java b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerFuelWidget.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/gui/widgets/CoalBoilerFuelWidget.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerFuelWidget.java index ffe0ba4ea..c0e408e5e 100644 --- a/common/src/main/java/muramasa/gregtech/gui/widgets/CoalBoilerFuelWidget.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerFuelWidget.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.gui.widgets; +package org.gtreimagined.gt5r.gui.widgets; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityCoalBoiler; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.IGuiElement; @@ -10,7 +11,6 @@ import muramasa.antimatter.integration.jeirei.AntimatterJEIREIPlugin; import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.blockentity.single.BlockEntityCoalBoiler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/gui/widgets/CoalBoilerWidget.java b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerWidget.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/gui/widgets/CoalBoilerWidget.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerWidget.java index 15c4ab440..79b817b41 100644 --- a/common/src/main/java/muramasa/gregtech/gui/widgets/CoalBoilerWidget.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/CoalBoilerWidget.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.gui.widgets; +package org.gtreimagined.gt5r.gui.widgets; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityCoalBoiler; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.IGuiElement; import muramasa.antimatter.gui.Widget; @@ -8,7 +9,6 @@ import muramasa.antimatter.gui.widget.WidgetSupplier; import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.blockentity.single.BlockEntityCoalBoiler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/gui/widgets/FusionButtonWidget.java b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/FusionButtonWidget.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/gui/widgets/FusionButtonWidget.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/widgets/FusionButtonWidget.java index 56e7c7603..c953ae7f4 100644 --- a/common/src/main/java/muramasa/gregtech/gui/widgets/FusionButtonWidget.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/FusionButtonWidget.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.gui.widgets; +package org.gtreimagined.gt5r.gui.widgets; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.multi.BlockEntityFusionReactor; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.ICanSyncData; import muramasa.antimatter.gui.IGuiElement; @@ -8,8 +10,6 @@ import muramasa.antimatter.gui.widget.WidgetSupplier; import muramasa.antimatter.integration.jeirei.AntimatterJEIREIPlugin; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.multi.BlockEntityFusionReactor; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/muramasa/gregtech/gui/widgets/LavaBoilerWidget.java b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/LavaBoilerWidget.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/gui/widgets/LavaBoilerWidget.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/widgets/LavaBoilerWidget.java index 49c3065ca..22a368588 100644 --- a/common/src/main/java/muramasa/gregtech/gui/widgets/LavaBoilerWidget.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/LavaBoilerWidget.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.gui.widgets; +package org.gtreimagined.gt5r.gui.widgets; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityLavaBoiler; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.IGuiElement; import muramasa.antimatter.gui.Widget; @@ -8,7 +9,6 @@ import muramasa.antimatter.gui.widget.WidgetSupplier; import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.blockentity.single.BlockEntityLavaBoiler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/gui/widgets/SolarBoilerWidget.java b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/SolarBoilerWidget.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/gui/widgets/SolarBoilerWidget.java rename to common/src/main/java/org/gtreimagined/gt5r/gui/widgets/SolarBoilerWidget.java index 0ea888bff..a3e0e9826 100644 --- a/common/src/main/java/muramasa/gregtech/gui/widgets/SolarBoilerWidget.java +++ b/common/src/main/java/org/gtreimagined/gt5r/gui/widgets/SolarBoilerWidget.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.gui.widgets; +package org.gtreimagined.gt5r.gui.widgets; import com.mojang.blaze3d.vertex.PoseStack; +import org.gtreimagined.gt5r.blockentity.single.BlockEntitySolarBoiler; import muramasa.antimatter.gui.GuiInstance; import muramasa.antimatter.gui.IGuiElement; import muramasa.antimatter.gui.Widget; @@ -8,7 +9,6 @@ import muramasa.antimatter.gui.widget.WidgetSupplier; import muramasa.antimatter.mixin.client.AbstractContainerScreenAccessor; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.blockentity.single.BlockEntitySolarBoiler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/integration/AppliedEnergisticsRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/AppliedEnergisticsRegistrar.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/integration/AppliedEnergisticsRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/AppliedEnergisticsRegistrar.java index d3c4a086d..6d2be7acf 100644 --- a/common/src/main/java/muramasa/gregtech/integration/AppliedEnergisticsRegistrar.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/AppliedEnergisticsRegistrar.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration; +package org.gtreimagined.gt5r.integration; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; @@ -13,8 +13,8 @@ import muramasa.antimatter.registration.Side; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; import net.minecraft.resources.ResourceLocation; @@ -33,8 +33,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.*; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.*; public class AppliedEnergisticsRegistrar implements IAntimatterRegistrar { diff --git a/common/src/main/java/muramasa/gregtech/integration/ForestryRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/ForestryRegistrar.java similarity index 100% rename from common/src/main/java/muramasa/gregtech/integration/ForestryRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/ForestryRegistrar.java diff --git a/common/src/main/java/muramasa/gregtech/integration/GalacticraftRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/GalacticraftRegistrar.java similarity index 100% rename from common/src/main/java/muramasa/gregtech/integration/GalacticraftRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/GalacticraftRegistrar.java diff --git a/common/src/main/java/muramasa/gregtech/integration/IC2ClassicRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/IC2ClassicRegistrar.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/integration/IC2ClassicRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/IC2ClassicRegistrar.java index 29e9dc4df..56b3d967c 100644 --- a/common/src/main/java/muramasa/gregtech/integration/IC2ClassicRegistrar.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/IC2ClassicRegistrar.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration; +package org.gtreimagined.gt5r.integration; import muramasa.antimatter.Ref; import muramasa.antimatter.registration.IAntimatterRegistrar; diff --git a/common/src/main/java/muramasa/gregtech/integration/IC2Registrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/IC2Registrar.java similarity index 100% rename from common/src/main/java/muramasa/gregtech/integration/IC2Registrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/IC2Registrar.java diff --git a/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/SpaceModRegistrar.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/SpaceModRegistrar.java index 346c5a1b5..9524d420f 100644 --- a/common/src/main/java/muramasa/gregtech/integration/SpaceModRegistrar.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/SpaceModRegistrar.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration; +package org.gtreimagined.gt5r.integration; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterMod; @@ -11,7 +11,7 @@ import muramasa.antimatter.registration.Side; import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5RRef; +import org.gtreimagined.gt5r.GT5RRef; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; diff --git a/common/src/main/java/muramasa/gregtech/integration/UndergroundBiomesRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/UndergroundBiomesRegistrar.java similarity index 100% rename from common/src/main/java/muramasa/gregtech/integration/UndergroundBiomesRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/UndergroundBiomesRegistrar.java diff --git a/common/src/main/java/muramasa/gregtech/integration/rei/MaterialTreeCategory.java b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/MaterialTreeCategory.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/integration/rei/MaterialTreeCategory.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/rei/MaterialTreeCategory.java index a713e2488..70138fae8 100644 --- a/common/src/main/java/muramasa/gregtech/integration/rei/MaterialTreeCategory.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/MaterialTreeCategory.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.rei; +package org.gtreimagined.gt5r.integration.rei; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -24,7 +24,7 @@ import muramasa.antimatter.pipe.types.ItemPipe; import muramasa.antimatter.pipe.types.Wire; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; +import org.gtreimagined.gt5r.GT5RRef; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiComponent; diff --git a/common/src/main/java/muramasa/gregtech/integration/rei/MaterialTreeDisplay.java b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/MaterialTreeDisplay.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/integration/rei/MaterialTreeDisplay.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/rei/MaterialTreeDisplay.java index dea062d79..1c00d3dc3 100644 --- a/common/src/main/java/muramasa/gregtech/integration/rei/MaterialTreeDisplay.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/MaterialTreeDisplay.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.rei; +package org.gtreimagined.gt5r.integration.rei; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; diff --git a/common/src/main/java/muramasa/gregtech/integration/rei/OreProcessingCategory.java b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/OreProcessingCategory.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/integration/rei/OreProcessingCategory.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/rei/OreProcessingCategory.java index 092e06948..4252d6ddc 100644 --- a/common/src/main/java/muramasa/gregtech/integration/rei/OreProcessingCategory.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/OreProcessingCategory.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.rei; +package org.gtreimagined.gt5r.integration.rei; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -20,10 +20,10 @@ import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.material.Material; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.Machines; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.Machines; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/muramasa/gregtech/integration/rei/OreProcessingDisplay.java b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/OreProcessingDisplay.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/integration/rei/OreProcessingDisplay.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/rei/OreProcessingDisplay.java index 18546a881..f7f502d06 100644 --- a/common/src/main/java/muramasa/gregtech/integration/rei/OreProcessingDisplay.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/OreProcessingDisplay.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.rei; +package org.gtreimagined.gt5r.integration.rei; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; @@ -9,7 +9,7 @@ import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.MaterialTags; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import net.minecraft.world.item.crafting.Ingredient; import java.util.Arrays; diff --git a/common/src/main/java/muramasa/gregtech/integration/rei/REIRegistrar.java b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/REIRegistrar.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/integration/rei/REIRegistrar.java rename to common/src/main/java/org/gtreimagined/gt5r/integration/rei/REIRegistrar.java index a0fcafa9a..d4bed6ad1 100644 --- a/common/src/main/java/muramasa/gregtech/integration/rei/REIRegistrar.java +++ b/common/src/main/java/org/gtreimagined/gt5r/integration/rei/REIRegistrar.java @@ -1,12 +1,12 @@ -package muramasa.gregtech.integration.rei; +package org.gtreimagined.gt5r.integration.rei; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.integration.rei.REIUtils; import muramasa.antimatter.machine.Tier; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.Machines; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.Machines; import net.minecraft.world.item.ItemStack; public class REIRegistrar { diff --git a/common/src/main/java/muramasa/gregtech/items/ICoverTooltipInfo.java b/common/src/main/java/org/gtreimagined/gt5r/items/ICoverTooltipInfo.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/items/ICoverTooltipInfo.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ICoverTooltipInfo.java index 0d2dc91c1..ffc2dd32a 100644 --- a/common/src/main/java/muramasa/gregtech/items/ICoverTooltipInfo.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ICoverTooltipInfo.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/common/src/main/java/muramasa/gregtech/items/IItemReactorRod.java b/common/src/main/java/org/gtreimagined/gt5r/items/IItemReactorRod.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/items/IItemReactorRod.java rename to common/src/main/java/org/gtreimagined/gt5r/items/IItemReactorRod.java index 24ed42ac2..762d5dc3e 100644 --- a/common/src/main/java/muramasa/gregtech/items/IItemReactorRod.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/IItemReactorRod.java @@ -1,7 +1,7 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import muramasa.antimatter.registration.IColorHandler; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; import net.minecraft.world.item.ItemStack; public interface IItemReactorRod extends IColorHandler { diff --git a/common/src/main/java/muramasa/gregtech/items/ItemBreederRod.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemBreederRod.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/items/ItemBreederRod.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemBreederRod.java index 29f7ae623..67b86ad48 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemBreederRod.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemBreederRod.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import muramasa.antimatter.Ref; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.material.IMaterialObject; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemComponentRod.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemComponentRod.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/items/ItemComponentRod.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemComponentRod.java index 62efa5323..39ae3fe37 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemComponentRod.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemComponentRod.java @@ -1,14 +1,14 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import muramasa.antimatter.Ref; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.material.IMaterialObject; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; -import muramasa.gregtech.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RItems; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemCoverCustomTooltip.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemCoverCustomTooltip.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/items/ItemCoverCustomTooltip.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemCoverCustomTooltip.java index 311b10ec4..3b0197f02 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemCoverCustomTooltip.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemCoverCustomTooltip.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; import muramasa.antimatter.item.ItemCover; import muramasa.antimatter.machine.Tier; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemDataStick.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemDataStick.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/items/ItemDataStick.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemDataStick.java index 1796029f7..2b2cb3140 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemDataStick.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemDataStick.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.util.Utils; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemDepletedRod.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemDepletedRod.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/items/ItemDepletedRod.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemDepletedRod.java index efdb466bf..bb9f8294f 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemDepletedRod.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemDepletedRod.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import muramasa.antimatter.Ref; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.material.IMaterialObject; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemEnrichedRod.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemEnrichedRod.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/items/ItemEnrichedRod.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemEnrichedRod.java index d658438ca..902fed501 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemEnrichedRod.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemEnrichedRod.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; import muramasa.antimatter.Ref; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.material.IMaterialObject; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemNuclearFuelRod.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemNuclearFuelRod.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/items/ItemNuclearFuelRod.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemNuclearFuelRod.java index 97ad26dd8..68842cae6 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemNuclearFuelRod.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemNuclearFuelRod.java @@ -1,7 +1,10 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.single.BlockEntityNuclearReactorCore; +import org.gtreimagined.gt5r.data.Materials; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.item.ItemBasic; @@ -10,8 +13,6 @@ import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.CodeUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntityNuclearReactorCore; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -24,8 +25,6 @@ import java.util.List; -import static muramasa.gregtech.data.Materials.*; - public class ItemNuclearFuelRod extends ItemBasic implements IItemReactorRod, IMaterialObject { private final Material material; private final int emission, self, maximum, div; @@ -62,7 +61,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.2", FluidPlatformUtils.INSTANCE.getFluidDisplayName(DistilledWater.getLiquid(1)), FluidPlatformUtils.INSTANCE.getFluidDisplayName(SemiheavyWater.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.2", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.DistilledWater.getLiquid(1)), FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.SemiheavyWater.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal(emission + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal(self + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(maximum + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -71,7 +70,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(HeavyWater.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.HeavyWater.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal(emission + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal(self + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(CodeUtils.divup(maximum, 8) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -80,7 +79,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(TritiatedWater.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.TritiatedWater.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal(emission + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal(self + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(CodeUtils.divup(maximum, 16) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -89,7 +88,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Tin.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.Tin.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal(emission + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal(self + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(maximum + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -98,7 +97,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Sodium.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.Sodium.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal(emission + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal(self + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(maximum + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -107,7 +106,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Coolant.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.Coolant.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal((emission * 4) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal((self * 4) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(maximum + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -115,7 +114,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(LithiumChloride.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.LithiumChloride.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal(((emission - CodeUtils.divup(emission, 2))) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal((self * 5) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal((maximum + CodeUtils.divup(maximum, 4)) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -123,7 +122,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(ThoriumSalt.getLiquid(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.ThoriumSalt.getLiquid(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal((emission - CodeUtils.divup(emission, 2)) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal( "0").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal((maximum * 4) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -131,7 +130,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(CarbonDioxide.getGas(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.CarbonDioxide.getGas(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal(emission + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal((self * 3) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(maximum + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -139,7 +138,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List { - tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Helium.getGas(1))).withStyle(ChatFormatting.AQUA)); + tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.when_used.1", FluidPlatformUtils.INSTANCE.getFluidDisplayName(Materials.Helium.getGas(1))).withStyle(ChatFormatting.AQUA)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.emission", Utils.literal((emission - CodeUtils.divup(emission, 2)) + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.self", Utils.literal(self + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); tooltipComponents.add(Utils.translatable("tooltip.gt5r.nuclear_rod.maximum", Utils.literal(maximum + "").withStyle(ChatFormatting.WHITE), Utils.translatable("tooltip.gt5r.nuclear_rod.neutrons").withStyle(ChatFormatting.DARK_PURPLE)).withStyle(ChatFormatting.GREEN)); @@ -182,22 +181,22 @@ public int getReactorRodNeutronEmission(BlockEntityNuclearReactorCore reactor, i int tNeutronSelf = self; int tNeutronDiv = div; FluidHolder coldCoolant = reactor.fluidHandler.map(f -> f.getInputTanks().getFluidInTank(0)).orElse(FluidHooks.emptyFluid()); - if (coldCoolant.getFluid().is(Coolant.getFluidTag())) { + if (coldCoolant.getFluid().is(Materials.Coolant.getFluidTag())) { tNeutronOther *= 4; tNeutronSelf *= 4; tNeutronDiv *= 2; - } else if (coldCoolant.getFluid().is(CarbonDioxide.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.CarbonDioxide.getFluidTag())) { tNeutronSelf *= 3; - } else if (coldCoolant.getFluid().is(Helium.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.Helium.getFluidTag())) { tNeutronOther -= CodeUtils.divup(emission, 2); - } else if (coldCoolant.getFluid().is(LithiumChloride.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.LithiumChloride.getFluidTag())) { tNeutronOther -= CodeUtils.divup(emission, 2); tNeutronSelf *= 5; - } else if (coldCoolant.getFluid().is(ThoriumSalt.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.ThoriumSalt.getFluidTag())) { tNeutronOther -= CodeUtils.divup(emission, 2); tNeutronSelf = 0; tNeutronDiv -= 1; - } else if (coldCoolant.getFluid().is(Sodium.getFluidTag()) || coldCoolant.getFluid().is(Tin.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.Sodium.getFluidTag()) || coldCoolant.getFluid().is(Materials.Tin.getFluidTag())) { tNeutronDiv -= 1; } reactor.mNeutronCounts[slot] += tNeutronSelf; @@ -214,8 +213,8 @@ public boolean getReactorRodNeutronReaction(BlockEntityNuclearReactorCore reacto reactor.heatHandler.ifPresent(h -> h.insertInternal(reactor.oNeutronCounts[slot], false)); FluidHolder coldCoolant = reactor.fluidHandler.map(f -> f.getInputTanks().getFluidInTank(0)).orElse(FluidHooks.emptyFluid()); int tNeutronMax = getReactorRodNeutronMaximum(reactor, slot, stack); - if (coldCoolant.getFluid().is(DistilledWater.getFluidTag()) || coldCoolant.getFluid().is(SemiheavyWater.getFluidTag()) - || coldCoolant.getFluid().is(HeavyWater.getFluidTag()) || coldCoolant.getFluid().is(TritiatedWater.getFluidTag())){ + if (coldCoolant.getFluid().is(Materials.DistilledWater.getFluidTag()) || coldCoolant.getFluid().is(Materials.SemiheavyWater.getFluidTag()) + || coldCoolant.getFluid().is(Materials.HeavyWater.getFluidTag()) || coldCoolant.getFluid().is(Materials.TritiatedWater.getFluidTag())){ stack.getOrCreateTag().putBoolean("moderated", true); stack.getOrCreateTag().putBoolean("oldModerated", true); } @@ -248,13 +247,13 @@ public int getReactorRodNeutronReflection(BlockEntityNuclearReactorCore reactor, @Override public int getReactorRodNeutronMaximum(BlockEntityNuclearReactorCore reactor, int slot, ItemStack stack) { FluidHolder coldCoolant = reactor.fluidHandler.map(f -> f.getInputTanks().getFluidInTank(0)).orElse(FluidHooks.emptyFluid()); - if (coldCoolant.getFluid().is(LithiumChloride.getFluidTag())) { + if (coldCoolant.getFluid().is(Materials.LithiumChloride.getFluidTag())) { return (int) (maximum * CodeUtils.divup(maximum, 4)); - } else if (coldCoolant.getFluid().is(ThoriumSalt.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.ThoriumSalt.getFluidTag())) { return maximum * 4; - } else if (coldCoolant.getFluid().is(HeavyWater.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.HeavyWater.getFluidTag())) { return (int) CodeUtils.divup(maximum, 8); - } else if (coldCoolant.getFluid().is(TritiatedWater.getFluidTag())) { + } else if (coldCoolant.getFluid().is(Materials.TritiatedWater.getFluidTag())) { return (int) CodeUtils.divup(maximum, 16); } else { return maximum; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemPortableScanner.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemPortableScanner.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/items/ItemPortableScanner.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemPortableScanner.java index f375d10d9..9e4821052 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemPortableScanner.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemPortableScanner.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.Ref; import muramasa.antimatter.capability.energy.ItemEnergyHandler; import muramasa.antimatter.item.ScannerItem; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionResult; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemPowerUnit.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemPowerUnit.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/items/ItemPowerUnit.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemPowerUnit.java index 7b4f4a29b..fd9bf423f 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemPowerUnit.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemPowerUnit.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; import muramasa.antimatter.Ref; import muramasa.antimatter.capability.energy.ItemEnergyHandler; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemPrintedPages.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemPrintedPages.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/items/ItemPrintedPages.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemPrintedPages.java index bc193ef7f..e013e0829 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemPrintedPages.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemPrintedPages.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.util.Utils; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemSprayCan.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemSprayCan.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/items/ItemSprayCan.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemSprayCan.java index 2db870d74..cd5003688 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemSprayCan.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemSprayCan.java @@ -1,5 +1,6 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.pipe.BlockEntityPipe; import muramasa.antimatter.item.ICustomDurability; @@ -7,8 +8,7 @@ import muramasa.antimatter.pipe.types.FluidPipe; import muramasa.antimatter.pipe.types.ItemPipe; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RData; +import org.gtreimagined.gt5r.data.GT5RData; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.EquipmentSlot; @@ -22,7 +22,7 @@ import java.util.List; -import static muramasa.gregtech.data.GT5RItems.EmptySprayCan; +import static org.gtreimagined.gt5r.data.GT5RItems.EmptySprayCan; public class ItemSprayCan extends ItemBasic implements ICustomDurability { private final DyeColor color; diff --git a/common/src/main/java/muramasa/gregtech/items/ItemTurbineRotor.java b/common/src/main/java/org/gtreimagined/gt5r/items/ItemTurbineRotor.java similarity index 86% rename from common/src/main/java/muramasa/gregtech/items/ItemTurbineRotor.java rename to common/src/main/java/org/gtreimagined/gt5r/items/ItemTurbineRotor.java index 949bc7ea1..934b2004e 100644 --- a/common/src/main/java/muramasa/gregtech/items/ItemTurbineRotor.java +++ b/common/src/main/java/org/gtreimagined/gt5r/items/ItemTurbineRotor.java @@ -1,13 +1,14 @@ -package muramasa.gregtech.items; +package org.gtreimagined.gt5r.items; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import org.gtreimagined.gt5r.data.Materials; +import org.gtreimagined.gt5r.data.ToolTypes; import muramasa.antimatter.material.Material; import muramasa.antimatter.tool.AntimatterItemTier; import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.tool.MaterialTool; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.data.ToolTypes; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EquipmentSlot; @@ -18,8 +19,6 @@ import java.util.List; -import static muramasa.gregtech.data.Materials.*; - public class ItemTurbineRotor extends MaterialTool { public ItemTurbineRotor(String domain, AntimatterToolType type, AntimatterItemTier tier, Properties properties) { super(domain, type, tier, properties); @@ -41,10 +40,10 @@ public float getSpeed(){ } public Material getRodMaterial(){ - if (type == ToolTypes.TURBINE_ROTOR) return Titanium; - if (type == ToolTypes.LARGE_TURBINE_ROTOR) return TungstenSteel; - if (type == ToolTypes.HUGE_TURBINE_ROTOR) return Americium; - return Magnalium; + if (type == ToolTypes.TURBINE_ROTOR) return Materials.Titanium; + if (type == ToolTypes.LARGE_TURBINE_ROTOR) return Materials.TungstenSteel; + if (type == ToolTypes.HUGE_TURBINE_ROTOR) return Materials.Americium; + return Materials.Magnalium; } @Override diff --git a/common/src/main/java/org/gtreimagined/gt5r/loader/SimpleMachineLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/SimpleMachineLoader.java new file mode 100644 index 000000000..3f8a2d4d3 --- /dev/null +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/SimpleMachineLoader.java @@ -0,0 +1,2 @@ +package org.gtreimagined.gt5r.loader;public class SimpleMachineLoader { +} diff --git a/common/src/main/java/muramasa/gregtech/loader/WorldGenLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/WorldGenLoader.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/loader/WorldGenLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/WorldGenLoader.java index afd776b05..d6e14c22a 100644 --- a/common/src/main/java/muramasa/gregtech/loader/WorldGenLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/WorldGenLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader; +package org.gtreimagined.gt5r.loader; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterConfig; @@ -11,9 +11,9 @@ import muramasa.antimatter.worldgen.smallore.WorldGenSmallOreBuilder; import muramasa.antimatter.worldgen.vanillaore.WorldGenVanillaOreBuilder; import muramasa.antimatter.worldgen.vein.WorldGenVeinLayerBuilder; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.worldgen.OilSpoutFluid; -import muramasa.gregtech.worldgen.OilSpoutSavedData; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.worldgen.OilSpoutFluid; +import org.gtreimagined.gt5r.worldgen.OilSpoutSavedData; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -25,7 +25,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.ORE_STONE; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.data.AntimatterStoneTypes.*; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; import static net.minecraft.world.level.Level.END; import static net.minecraft.world.level.Level.NETHER; import static net.minecraft.world.level.Level.OVERWORLD; diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/BlockParts.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/BlockParts.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/crafting/BlockParts.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/BlockParts.java index f38a6f0d5..fa3c558ed 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/BlockParts.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/BlockParts.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RRef; +import gtreimagined.gt5r.block.*; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -11,10 +13,9 @@ import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.pipe.types.PipeType; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.block.*; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.GT5RTags; +import muramasa.gt5r.block.*; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RTags; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.SingleItemRecipeBuilder; import net.minecraft.resources.ResourceLocation; @@ -24,6 +25,12 @@ import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import org.gtreimagined.gt5r.block.BlockAsphalt; +import org.gtreimagined.gt5r.block.BlockAsphaltSlab; +import org.gtreimagined.gt5r.block.BlockAsphaltStair; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.block.BlockCoil; +import org.gtreimagined.gt5r.block.BlockColoredWall; import org.gtreimagined.gtcore.data.GTCoreItems; import java.util.function.Consumer; @@ -34,9 +41,9 @@ import static muramasa.antimatter.data.AntimatterMaterials.Copper; import static muramasa.antimatter.data.AntimatterMaterials.Wood; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.Machines.HULL; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.TierMaps.*; +import static org.gtreimagined.gt5r.data.Machines.HULL; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.TierMaps.*; public class BlockParts { public static void loadRecipes(Consumer output, AntimatterRecipeProvider provider) { diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/ElectricToolRecipes.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/ElectricToolRecipes.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/loader/crafting/ElectricToolRecipes.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/ElectricToolRecipes.java index 42adb5bd9..8448d67fe 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/ElectricToolRecipes.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/ElectricToolRecipes.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -9,9 +10,8 @@ import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.ingredient.PropertyIngredient; import muramasa.antimatter.tool.IAntimatterTool; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.ToolTypes; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.ToolTypes; import net.minecraft.advancements.CriterionTriggerInstance; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.TagKey; @@ -30,7 +30,7 @@ import static muramasa.antimatter.data.AntimatterMaterials.Diamond; import static muramasa.antimatter.data.AntimatterMaterials.Wood; import static muramasa.antimatter.material.MaterialTags.TOOLS; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; import static org.gtreimagined.gtcore.data.GTCoreTags.*; import static org.gtreimagined.gtcore.data.GTCoreTools.*; diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/MachineRecipes.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/MachineRecipes.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/loader/crafting/MachineRecipes.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/MachineRecipes.java index 759aed39d..ba9da497c 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/MachineRecipes.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/MachineRecipes.java @@ -1,6 +1,11 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5Reimagined; +import gtreimagined.gt5r.data.*; +import org.gtreimagined.gt5r.machine.MultiblockTankMachine; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -14,11 +19,7 @@ import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.pipe.types.Wire; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.data.*; -import muramasa.gregtech.machine.MultiblockTankMachine; +import muramasa.gt5r.data.*; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -26,6 +27,13 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RMaterialTypes; +import org.gtreimagined.gt5r.data.GT5RTags; +import org.gtreimagined.gt5r.data.Materials; +import org.gtreimagined.gt5r.data.TierMaps; import org.gtreimagined.gtcore.GTCore; import org.gtreimagined.gtcore.data.GTCoreBlocks; import org.gtreimagined.gtcore.data.GTCoreMaterials; @@ -40,9 +48,9 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.Machines.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.TierMaps.*; +import static org.gtreimagined.gt5r.data.Machines.*; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.TierMaps.*; import static org.gtreimagined.gtcore.data.GTCoreItems.*; import static org.gtreimagined.gtcore.data.GTCoreTags.*; diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/MaterialCrafting.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/MaterialCrafting.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/crafting/MaterialCrafting.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/MaterialCrafting.java index 565c43482..fbd33f525 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/MaterialCrafting.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/MaterialCrafting.java @@ -1,6 +1,7 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.ForgeCTags; @@ -8,8 +9,7 @@ import muramasa.antimatter.material.MaterialTypeItem; import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.pipe.types.ItemPipe; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RMaterialTypes; +import org.gtreimagined.gt5r.data.GT5RMaterialTypes; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -23,8 +23,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.material.MaterialTags.QUARTZ_LIKE_BLOCKS; -import static muramasa.gregtech.data.GT5RMaterialTypes.CHAMBER; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.GT5RMaterialTypes.CHAMBER; +import static org.gtreimagined.gt5r.data.Materials.*; public class MaterialCrafting { public static void loadRecipes(Consumer output, AntimatterRecipeProvider provider) { diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Miscellaneous.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Miscellaneous.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/loader/crafting/Miscellaneous.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Miscellaneous.java index 212102509..0b2bccbdb 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/Miscellaneous.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Miscellaneous.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.data.ForgeCTags; import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RRef; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Parts.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Parts.java index 365fbb5a3..7ae3e5464 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Parts.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5Reimagined; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.ForgeCTags; @@ -10,11 +12,9 @@ import muramasa.antimatter.machine.Tier; import muramasa.antimatter.material.Material; import muramasa.antimatter.pipe.PipeSize; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.GT5RCovers; -import muramasa.gregtech.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RItems; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -32,9 +32,9 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.GT5RItems.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.TierMaps.*; +import static org.gtreimagined.gt5r.data.GT5RItems.*; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.TierMaps.*; import static org.gtreimagined.gtcore.data.GTCoreItems.*; import static org.gtreimagined.gtcore.data.GTCoreTags.*; diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/Smelting.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Smelting.java similarity index 89% rename from common/src/main/java/muramasa/gregtech/loader/crafting/Smelting.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Smelting.java index 7eed36d2e..c74c75206 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/Smelting.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/Smelting.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.datagen.loaders.MaterialRecipes; import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; import net.minecraft.world.item.Items; @@ -15,7 +15,7 @@ import java.util.function.Consumer; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; public class Smelting { public static void loadRecipes(Consumer output, AntimatterRecipeProvider provider) { diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/SteamMachines.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/SteamMachines.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/crafting/SteamMachines.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/SteamMachines.java index 954977690..477bac285 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/SteamMachines.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/SteamMachines.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; import com.google.common.collect.ImmutableMap; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -6,9 +6,9 @@ import muramasa.antimatter.machine.Tier; import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.Machines; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.Machines; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.Items; @@ -16,7 +16,7 @@ import static muramasa.antimatter.data.AntimatterDefaultTools.HAMMER; import static muramasa.antimatter.data.AntimatterDefaultTools.WRENCH; -import static muramasa.gregtech.data.Materials.Bronze; +import static org.gtreimagined.gt5r.data.Materials.Bronze; public class SteamMachines { public static void loadRecipes(Consumer output, AntimatterRecipeProvider provider) { diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/VanillaExtensions.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/VanillaExtensions.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/crafting/VanillaExtensions.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/VanillaExtensions.java index 41d83418c..e7b83654f 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/VanillaExtensions.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/VanillaExtensions.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.data.ForgeCTags; import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RRef; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; @@ -20,7 +20,7 @@ import static muramasa.antimatter.data.AntimatterDefaultTools.WRENCH; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Coal; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; public class VanillaExtensions { public static void loadRecipes(Consumer consumer, AntimatterRecipeProvider provider) { diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/WireCablesPlates.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/WireCablesPlates.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/crafting/WireCablesPlates.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/WireCablesPlates.java index 2aa40429a..423ec2045 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/WireCablesPlates.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/WireCablesPlates.java @@ -1,7 +1,8 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -10,7 +11,6 @@ import muramasa.antimatter.pipe.types.Cable; import muramasa.antimatter.pipe.types.Wire; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5RRef; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -22,7 +22,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.PLATE; import static muramasa.antimatter.pipe.PipeSize.*; -import static muramasa.gregtech.data.Materials.Rubber; +import static org.gtreimagined.gt5r.data.Materials.Rubber; public class WireCablesPlates { @SuppressWarnings("unchecked") diff --git a/common/src/main/java/muramasa/gregtech/loader/crafting/WoodCrafting.java b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/WoodCrafting.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/loader/crafting/WoodCrafting.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/crafting/WoodCrafting.java index 3b8e45c74..93b4cfa8f 100644 --- a/common/src/main/java/muramasa/gregtech/loader/crafting/WoodCrafting.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/crafting/WoodCrafting.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.loader.crafting; +package org.gtreimagined.gt5r.loader.crafting; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider; import muramasa.antimatter.pipe.PipeSize; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RBlocks; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.tags.ItemTags; diff --git a/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java b/common/src/main/java/org/gtreimagined/gt5r/loader/items/Circuitry.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/items/Circuitry.java index 400d820b4..0e3290f30 100644 --- a/common/src/main/java/muramasa/gregtech/loader/items/Circuitry.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/items/Circuitry.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.loader.items; +package org.gtreimagined.gt5r.loader.items; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.data.ForgeCTags; @@ -11,11 +13,9 @@ import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.GT5RCovers; -import muramasa.gregtech.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RItems; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; @@ -35,11 +35,11 @@ import static muramasa.antimatter.machine.Tier.LV; import static muramasa.antimatter.machine.Tier.MV; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.GT5RMaterialTags.SOLDER; -import static muramasa.gregtech.data.GT5RMaterialTypes.BOULE; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.*; -import static muramasa.gregtech.data.TierMaps.CABLE_GETTER; +import static org.gtreimagined.gt5r.data.GT5RMaterialTags.SOLDER; +import static org.gtreimagined.gt5r.data.GT5RMaterialTypes.BOULE; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.*; +import static org.gtreimagined.gt5r.data.TierMaps.CABLE_GETTER; import static org.gtreimagined.gtcore.data.GTCoreItems.*; import static org.gtreimagined.gtcore.data.GTCoreTags.*; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/AlloySmelterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/AlloySmelterLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/machines/AlloySmelterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/AlloySmelterLoader.java index d5f82520b..1f402a4d8 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/AlloySmelterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/AlloySmelterLoader.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.MaterialStack; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.gtreimagined.gtcore.data.GTCoreItems; @@ -15,8 +15,8 @@ import static muramasa.antimatter.material.MaterialTags.METAL; import static muramasa.antimatter.material.MaterialTags.RUBBERTOOLS; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.ALLOY_SMELTER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.ALLOY_SMELTER; public class AlloySmelterLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ArcFurnaceLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ArcFurnaceLoader.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/machines/ArcFurnaceLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ArcFurnaceLoader.java index ef3313ad7..864b21d17 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ArcFurnaceLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ArcFurnaceLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -17,13 +17,13 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.recipe.map.RecipeBuilder; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.block.BlockCasing; -import muramasa.gregtech.block.BlockColoredWall; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.GT5RCovers; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.block.BlockColoredWall; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; @@ -36,9 +36,9 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.machine.Tier.*; -import static muramasa.gregtech.data.Machines.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.TierMaps.TIER_MATERIALS; +import static org.gtreimagined.gt5r.data.Machines.*; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.TierMaps.TIER_MATERIALS; public class ArcFurnaceLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/AssemblerLoader.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/AssemblerLoader.java index 683dc7d3f..dce4a9d1d 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/AssemblerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/AssemblerLoader.java @@ -1,6 +1,12 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import com.google.common.collect.ImmutableSet; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RCovers; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RMaterialTypes; +import org.gtreimagined.gt5r.data.Machines; +import org.gtreimagined.gt5r.data.ToolTypes; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.machine.Tier; @@ -14,12 +20,12 @@ import muramasa.antimatter.recipe.ingredient.FluidIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.block.BlockCasing; -import muramasa.gregtech.block.BlockCoil; -import muramasa.gregtech.block.BlockColoredWall; -import muramasa.gregtech.data.*; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.block.BlockCoil; +import org.gtreimagined.gt5r.block.BlockColoredWall; +import muramasa.gt5r.data.*; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -41,11 +47,11 @@ import static muramasa.antimatter.machine.Tier.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.ofObject; -import static muramasa.gregtech.data.Machines.HULL; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.ASSEMBLER; -import static muramasa.gregtech.data.TierMaps.*; -import static muramasa.gregtech.loader.crafting.Parts.fromTier; +import static org.gtreimagined.gt5r.data.Machines.HULL; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.ASSEMBLER; +import static org.gtreimagined.gt5r.data.TierMaps.*; +import static org.gtreimagined.gt5r.loader.crafting.Parts.fromTier; import static org.gtreimagined.gtcore.data.GTCoreItems.*; import static org.gtreimagined.gtcore.data.GTCoreTags.*; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/AutoclaveLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/AutoclaveLoader.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/loader/machines/AutoclaveLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/AutoclaveLoader.java index 10331dddb..f2ae3e171 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/AutoclaveLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/AutoclaveLoader.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.gtreimagined.gtcore.data.GTCoreItems; @@ -13,8 +13,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Water; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.AUTOCLAVE; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.AUTOCLAVE; import static org.gtreimagined.gtcore.data.GTCoreItems.EnergyCrystal; import static org.gtreimagined.gtcore.data.GTCoreItems.RawLapotronCrustal; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/BathLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/BathLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/machines/BathLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/BathLoader.java index c5442e8e5..67cad7251 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/BathLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/BathLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; @@ -11,10 +11,10 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.integration.SpaceModRegistrar; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.integration.SpaceModRegistrar; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; @@ -31,10 +31,10 @@ import static muramasa.antimatter.Ref.U; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.GT5RMaterialTags.BATH_MERCURY; -import static muramasa.gregtech.data.GT5RMaterialTags.BATH_PERSULFATE; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.BATH; +import static org.gtreimagined.gt5r.data.GT5RMaterialTags.BATH_MERCURY; +import static org.gtreimagined.gt5r.data.GT5RMaterialTags.BATH_PERSULFATE; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.BATH; public class BathLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/BenderLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/BenderLoader.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/loader/machines/BenderLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/BenderLoader.java index 448a3844d..b098bc068 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/BenderLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/BenderLoader.java @@ -1,19 +1,19 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.MaterialTags; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import java.util.function.ToLongFunction; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.gregtech.data.RecipeMaps.BENDER; +import static org.gtreimagined.gt5r.data.RecipeMaps.BENDER; import static org.gtreimagined.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS; public class BenderLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/CannerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CannerLoader.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/loader/machines/CannerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/CannerLoader.java index a50f7cc97..5577048d7 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/CannerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CannerLoader.java @@ -1,16 +1,16 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.items.ItemBreederRod; -import muramasa.gregtech.items.ItemNuclearFuelRod; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.items.ItemBreederRod; +import org.gtreimagined.gt5r.items.ItemNuclearFuelRod; import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.CANNER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.CANNER; public class CannerLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/CentrifugeLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CentrifugeLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/machines/CentrifugeLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/CentrifugeLoader.java index 3cb042f3b..dd7c99565 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/CentrifugeLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CentrifugeLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; @@ -6,9 +6,9 @@ import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.map.RecipeBuilder; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.items.ItemDepletedRod; -import muramasa.gregtech.items.ItemEnrichedRod; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.items.ItemDepletedRod; +import org.gtreimagined.gt5r.items.ItemEnrichedRod; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import org.gtreimagined.gtcore.data.GTCoreFluids; @@ -20,9 +20,9 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.GT5RMaterialTags.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.CENTRIFUGE; +import static org.gtreimagined.gt5r.data.GT5RMaterialTags.*; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.CENTRIFUGE; import static net.minecraft.world.item.Items.*; public class CentrifugeLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ChemicalReactorLoader.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ChemicalReactorLoader.java index f5e754b3e..968db6cdc 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ChemicalReactorLoader.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.data.GT5RTags; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.data.GT5RTags; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -14,8 +14,8 @@ import static muramasa.antimatter.data.AntimatterMaterials.Gold; import static muramasa.antimatter.data.AntimatterMaterials.Water; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.CHEMICAL_REACTOR; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.CHEMICAL_REACTOR; import static org.gtreimagined.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS; public class ChemicalReactorLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CompressorLoader.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/CompressorLoader.java index 7efc5fa4e..c0189752e 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/CompressorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CompressorLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.ForgeCTags; @@ -10,8 +10,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.COMPRESSOR; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.COMPRESSOR; import static org.gtreimagined.gtcore.data.GTCoreItems.*; public class CompressorLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/CrystallizationChamberLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CrystallizationChamberLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/machines/CrystallizationChamberLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/CrystallizationChamberLoader.java index 569893735..8d1830b58 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/CrystallizationChamberLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CrystallizationChamberLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.material.Material; @@ -7,9 +7,9 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST_TINY; import static muramasa.antimatter.data.AntimatterMaterials.Iron; -import static muramasa.gregtech.data.GT5RMaterialTypes.BOULE; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.CRYSTALLIZATION_CHAMBER; +import static org.gtreimagined.gt5r.data.GT5RMaterialTypes.BOULE; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.CRYSTALLIZATION_CHAMBER; public class CrystallizationChamberLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/CutterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CutterLoader.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/machines/CutterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/CutterLoader.java index 8f2d5a89d..abad8d134 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/CutterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/CutterLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; @@ -9,8 +9,8 @@ import muramasa.antimatter.ore.CobbleStoneType; import muramasa.antimatter.ore.StoneType; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -26,7 +26,7 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Wood; -import static muramasa.gregtech.data.RecipeMaps.CUTTER; +import static org.gtreimagined.gt5r.data.RecipeMaps.CUTTER; public class CutterLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/DehydratorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/DehydratorLoader.java similarity index 79% rename from common/src/main/java/muramasa/gregtech/loader/machines/DehydratorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/DehydratorLoader.java index e194a4cee..9ae38e322 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/DehydratorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/DehydratorLoader.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; -import muramasa.gregtech.GT5RConfig; +import org.gtreimagined.gt5r.GT5RConfig; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST_SMALL; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.DEHYDRATOR; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.DEHYDRATOR; public class DehydratorLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/DistilleryLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/DistilleryLoader.java similarity index 60% rename from common/src/main/java/muramasa/gregtech/loader/machines/DistilleryLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/DistilleryLoader.java index 25cb7cd89..ecc102e8f 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/DistilleryLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/DistilleryLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; public class DistilleryLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ElectrolyzerLoader.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ElectrolyzerLoader.java index 07801789e..79ab85b3b 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ElectrolyzerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ElectrolyzerLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -6,9 +6,9 @@ import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.recipe.map.RecipeBuilder; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.data.GT5RTags; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.data.GT5RTags; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -19,9 +19,9 @@ import static muramasa.antimatter.Ref.L; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.GT5RMaterialTags.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.ELECTROLYZER; +import static org.gtreimagined.gt5r.data.GT5RMaterialTags.*; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.ELECTROLYZER; import static org.gtreimagined.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS; public class ElectrolyzerLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ElectromagneticSeparatorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ElectromagneticSeparatorLoader.java similarity index 85% rename from common/src/main/java/muramasa/gregtech/loader/machines/ElectromagneticSeparatorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ElectromagneticSeparatorLoader.java index c59d28946..7d1f6da57 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ElectromagneticSeparatorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ElectromagneticSeparatorLoader.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterials; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.Materials; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.gregtech.data.RecipeMaps.ELECTROMAGNETIC_SEPARATOR; +import static org.gtreimagined.gt5r.data.RecipeMaps.ELECTROMAGNETIC_SEPARATOR; public class ElectromagneticSeparatorLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ExtractorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ExtractorLoader.java similarity index 89% rename from common/src/main/java/muramasa/gregtech/loader/machines/ExtractorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ExtractorLoader.java index 3d825e6d8..17c191a8d 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ExtractorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ExtractorLoader.java @@ -1,6 +1,5 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; -import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.ItemStack; import org.gtreimagined.gtcore.data.GTCoreBlocks; import org.gtreimagined.gtcore.data.GTCoreItems; @@ -8,8 +7,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.RawRubber; -import static muramasa.gregtech.data.RecipeMaps.EXTRACTOR; +import static org.gtreimagined.gt5r.data.Materials.RawRubber; +import static org.gtreimagined.gt5r.data.RecipeMaps.EXTRACTOR; public class ExtractorLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ExtruderLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ExtruderLoader.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/machines/ExtruderLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ExtruderLoader.java index 4e11d5284..3cded6303 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ExtruderLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ExtruderLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -8,9 +8,9 @@ import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.pipe.types.*; import muramasa.antimatter.tool.AntimatterToolType; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -24,9 +24,9 @@ import static muramasa.antimatter.data.AntimatterMaterials.Endstone; import static muramasa.antimatter.material.MaterialTags.RUBBERTOOLS; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.Glass; -import static muramasa.gregtech.data.Materials.Obsidian; -import static muramasa.gregtech.data.RecipeMaps.EXTRUDER; +import static org.gtreimagined.gt5r.data.Materials.Glass; +import static org.gtreimagined.gt5r.data.Materials.Obsidian; +import static org.gtreimagined.gt5r.data.RecipeMaps.EXTRUDER; public class ExtruderLoader { public static void init() { diff --git a/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FermenterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FermenterLoader.java new file mode 100644 index 000000000..c77b2a3b6 --- /dev/null +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FermenterLoader.java @@ -0,0 +1,11 @@ +package org.gtreimagined.gt5r.loader.machines; + +import static org.gtreimagined.gt5r.data.Materials.Biomass; +import static org.gtreimagined.gt5r.data.Materials.FermentedBiomass; +import static org.gtreimagined.gt5r.data.RecipeMaps.FERMENTER; + +public class FermenterLoader { + public static void init() { + FERMENTER.RB().fi(Biomass.getLiquid(100)).fo(FermentedBiomass.getLiquid(100)).add("fermented_biomass",100,2); + } +} diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FluidCannerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidCannerLoader.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/loader/machines/FluidCannerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidCannerLoader.java index b74b71b92..668aad23f 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/FluidCannerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidCannerLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; @@ -7,8 +7,8 @@ import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.data.GT5RItems; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.data.GT5RItems; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; @@ -19,8 +19,8 @@ import tesseract.FluidPlatformUtils; import tesseract.TesseractGraphWrappers; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.FLUID_CANNER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.FLUID_CANNER; public class FluidCannerLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FluidHeaterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidHeaterLoader.java similarity index 73% rename from common/src/main/java/muramasa/gregtech/loader/machines/FluidHeaterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidHeaterLoader.java index 9fa7b6be2..8a94401ba 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/FluidHeaterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidHeaterLoader.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterials; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.FLUID_HEATER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.FLUID_HEATER; public class FluidHeaterLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FluidPressLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidPressLoader.java similarity index 88% rename from common/src/main/java/muramasa/gregtech/loader/machines/FluidPressLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidPressLoader.java index 11849df04..8b90fad84 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/FluidPressLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidPressLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.TagUtils; @@ -8,8 +8,8 @@ import tesseract.TesseractGraphWrappers; import static muramasa.antimatter.Ref.L; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.FLUID_PRESS; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.FLUID_PRESS; public class FluidPressLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FluidSolidifierLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidSolidifierLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/machines/FluidSolidifierLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidSolidifierLoader.java index b041514d0..e0eda6674 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/FluidSolidifierLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FluidSolidifierLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -12,8 +12,8 @@ import static muramasa.antimatter.Ref.L9; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.FLUID_SOLIDIFYER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.FLUID_SOLIDIFYER; public class FluidSolidifierLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ForgeHammerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ForgeHammerLoader.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/loader/machines/ForgeHammerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ForgeHammerLoader.java index 3ac1d8376..a0fc480bd 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ForgeHammerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ForgeHammerLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -11,8 +11,8 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.TagUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -21,9 +21,9 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.material.MaterialTags.MACERATE_INTO; import static muramasa.antimatter.material.MaterialTags.ORE_MULTI; -import static muramasa.gregtech.data.Materials.Brick; -import static muramasa.gregtech.data.Materials.Glass; -import static muramasa.gregtech.data.RecipeMaps.FORGE_HAMMER; +import static org.gtreimagined.gt5r.data.Materials.Brick; +import static org.gtreimagined.gt5r.data.Materials.Glass; +import static org.gtreimagined.gt5r.data.RecipeMaps.FORGE_HAMMER; public class ForgeHammerLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/FormingPressLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FormingPressLoader.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/loader/machines/FormingPressLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/FormingPressLoader.java index 6d1034248..3d2552a03 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/FormingPressLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/FormingPressLoader.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.item.ItemBasic; import net.minecraft.world.item.ItemStack; import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.RecipeMaps.FORMING_PRESS; +import static org.gtreimagined.gt5r.data.RecipeMaps.FORMING_PRESS; public class FormingPressLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/LaserEngraverLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/LaserEngraverLoader.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/loader/machines/LaserEngraverLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/LaserEngraverLoader.java index 43967740a..cf699fce7 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/LaserEngraverLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/LaserEngraverLoader.java @@ -1,14 +1,14 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.world.item.ItemStack; import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.GT5RMaterialTypes.BOULE; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.GT5RMaterialTypes.BOULE; +import static org.gtreimagined.gt5r.data.Materials.*; public class LaserEngraverLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/LatheLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/LatheLoader.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/loader/machines/LatheLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/LatheLoader.java index 53498ba10..dc61a7a66 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/LatheLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/LatheLoader.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.material.Material; -import muramasa.gregtech.data.GT5RMaterialTags; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/MaceratorLoader.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/MaceratorLoader.java index 539368e1d..eef923955 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/MaceratorLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -13,7 +13,7 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.recipe.map.RecipeMap; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; @@ -30,9 +30,9 @@ import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.material.Material.NULL; import static muramasa.antimatter.material.MaterialTags.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.PULVERIZER; -import static muramasa.gregtech.data.RecipeMaps.SIFTER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.PULVERIZER; +import static org.gtreimagined.gt5r.data.RecipeMaps.SIFTER; import static org.gtreimagined.gtcore.data.GTCoreItems.Biochaff; public class MaceratorLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/MixerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/MixerLoader.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/machines/MixerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/MixerLoader.java index 35230f0ed..74a725bd9 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/MixerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/MixerLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; @@ -6,10 +6,10 @@ import muramasa.antimatter.material.MaterialTypeItem; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.block.BlockAsphalt; -import muramasa.gregtech.data.GT5RBlocks; -import muramasa.gregtech.data.GT5RItems; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.block.BlockAsphalt; +import org.gtreimagined.gt5r.data.GT5RBlocks; +import org.gtreimagined.gt5r.data.GT5RItems; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -23,8 +23,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.MIXER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.MIXER; import static org.gtreimagined.gtcore.data.GTCoreTags.DUST_LAPIS_LAZURITE; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/OreByproducts.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/OreByproducts.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/loader/machines/OreByproducts.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/OreByproducts.java index efc79ce39..5ed1a4efd 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/OreByproducts.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/OreByproducts.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -9,7 +9,7 @@ import java.util.List; -import static muramasa.gregtech.data.RecipeMaps.ORE_BYPRODUCTS; +import static org.gtreimagined.gt5r.data.RecipeMaps.ORE_BYPRODUCTS; public class OreByproducts { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/OreWasherLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/OreWasherLoader.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/loader/machines/OreWasherLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/OreWasherLoader.java index 5dd9b134d..872c838e0 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/OreWasherLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/OreWasherLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; @@ -7,7 +7,7 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.ItemStack; -import static muramasa.gregtech.data.RecipeMaps.ORE_WASHER; +import static org.gtreimagined.gt5r.data.RecipeMaps.ORE_WASHER; public class OreWasherLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/PackagerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/PackagerLoader.java similarity index 88% rename from common/src/main/java/muramasa/gregtech/loader/machines/PackagerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/PackagerLoader.java index 23795cd58..765d544b4 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/PackagerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/PackagerLoader.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.Material; -import static muramasa.gregtech.data.RecipeMaps.PACKAGER; +import static org.gtreimagined.gt5r.data.RecipeMaps.PACKAGER; public class PackagerLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/PolarizerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/PolarizerLoader.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/loader/machines/PolarizerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/PolarizerLoader.java index ce628cfaf..6e0e792f5 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/PolarizerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/PolarizerLoader.java @@ -1,14 +1,14 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.Ref; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.MaterialTypeBlock; import muramasa.antimatter.material.MaterialTypeItem; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.world.item.Item; import static muramasa.antimatter.data.AntimatterMaterials.Iron; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; public class PolarizerLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/PrinterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/PrinterLoader.java similarity index 78% rename from common/src/main/java/muramasa/gregtech/loader/machines/PrinterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/PrinterLoader.java index f0b6092aa..092b6b257 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/PrinterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/PrinterLoader.java @@ -1,14 +1,14 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import static muramasa.antimatter.Ref.L; -import static muramasa.gregtech.data.Materials.SquidInk; +import static org.gtreimagined.gt5r.data.Materials.SquidInk; public class PrinterLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/RoasterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/RoasterLoader.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/loader/machines/RoasterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/RoasterLoader.java index 014ce5dd3..65cd73917 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/RoasterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/RoasterLoader.java @@ -1,12 +1,12 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.RecipeMaps; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Copper; import static muramasa.antimatter.data.AntimatterMaterials.Iron; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; +import static org.gtreimagined.gt5r.data.Materials.*; public class RoasterLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/RockBreakerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/RockBreakerLoader.java similarity index 77% rename from common/src/main/java/muramasa/gregtech/loader/machines/RockBreakerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/RockBreakerLoader.java index bc5467425..9f9e05282 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/RockBreakerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/RockBreakerLoader.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import net.minecraft.world.item.Items; import org.gtreimagined.gtcore.data.GTCoreItems; -import static muramasa.gregtech.data.RecipeMaps.ROCK_BREAKER; +import static org.gtreimagined.gt5r.data.RecipeMaps.ROCK_BREAKER; public class RockBreakerLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ScannerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ScannerLoader.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/loader/machines/ScannerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ScannerLoader.java index b22a4cf5f..3476e8cea 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ScannerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ScannerLoader.java @@ -1,8 +1,8 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.data.GT5RItems; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.GT5RItems; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/SifterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/SifterLoader.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/loader/machines/SifterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/SifterLoader.java index 18320c3ed..e8588e86e 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/SifterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/SifterLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.ForgeCTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; @@ -6,7 +6,7 @@ import net.minecraft.world.item.Items; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.gregtech.data.RecipeMaps.SIFTER; +import static org.gtreimagined.gt5r.data.RecipeMaps.SIFTER; public class SifterLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/SmelterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/SmelterLoader.java similarity index 93% rename from common/src/main/java/muramasa/gregtech/loader/machines/SmelterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/SmelterLoader.java index e5d059310..d9081d057 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/SmelterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/SmelterLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.Material; @@ -7,8 +7,8 @@ import muramasa.antimatter.ore.CobbleStoneType; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import net.minecraft.world.level.block.Blocks; import org.gtreimagined.gtcore.data.GTCoreBlocks; @@ -16,8 +16,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Lava; import static muramasa.antimatter.material.MaterialTags.MOLTEN; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.SMELTER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.SMELTER; public class SmelterLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ThermalCentrifugeLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ThermalCentrifugeLoader.java similarity index 89% rename from common/src/main/java/muramasa/gregtech/loader/machines/ThermalCentrifugeLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/ThermalCentrifugeLoader.java index 4943198ef..1f2b0c9fd 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/ThermalCentrifugeLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/ThermalCentrifugeLoader.java @@ -1,14 +1,14 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import net.minecraft.world.item.ItemStack; -import static muramasa.gregtech.data.RecipeMaps.THERMAL_CENTRIFUGE; +import static org.gtreimagined.gt5r.data.RecipeMaps.THERMAL_CENTRIFUGE; public class ThermalCentrifugeLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/UUMatterLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/UUMatterLoader.java similarity index 87% rename from common/src/main/java/muramasa/gregtech/loader/machines/UUMatterLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/UUMatterLoader.java index 356b733bf..61ee0aa17 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/UUMatterLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/UUMatterLoader.java @@ -1,16 +1,16 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.map.RecipeBuilder; -import muramasa.gregtech.data.Materials; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.Materials; +import org.gtreimagined.gt5r.data.RecipeMaps; import org.gtreimagined.gtcore.data.GTCoreItems; import tesseract.TesseractGraphWrappers; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.gregtech.data.Materials.UUAmplifier; +import static org.gtreimagined.gt5r.data.Materials.UUAmplifier; public class UUMatterLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/UnpackagerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/UnpackagerLoader.java similarity index 87% rename from common/src/main/java/muramasa/gregtech/loader/machines/UnpackagerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/UnpackagerLoader.java index 8e533d6a6..a8848c23a 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/UnpackagerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/UnpackagerLoader.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.material.Material; import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.gregtech.data.RecipeMaps.UNPACKAGER; +import static org.gtreimagined.gt5r.data.RecipeMaps.UNPACKAGER; public class UnpackagerLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/WiremillLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/WiremillLoader.java similarity index 86% rename from common/src/main/java/muramasa/gregtech/loader/machines/WiremillLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/WiremillLoader.java index 4d3b102e5..7f1bd97db 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/WiremillLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/WiremillLoader.java @@ -1,20 +1,20 @@ -package muramasa.gregtech.loader.machines; +package org.gtreimagined.gt5r.loader.machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.pipe.types.Wire; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.data.GT5RBlocks; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.data.GT5RBlocks; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import org.gtreimagined.gtcore.block.RedstoneWire; import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; -import static muramasa.gregtech.data.GT5RBlocks.FLUID_PIPE_STEEL; -import static muramasa.gregtech.data.Materials.Carbon; -import static muramasa.gregtech.data.RecipeMaps.WIRE_MILL; +import static org.gtreimagined.gt5r.data.GT5RBlocks.FLUID_PIPE_STEEL; +import static org.gtreimagined.gt5r.data.Materials.Carbon; +import static org.gtreimagined.gt5r.data.RecipeMaps.WIRE_MILL; public class WiremillLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/generator/Fuels.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/Fuels.java similarity index 78% rename from common/src/main/java/muramasa/gregtech/loader/machines/generator/Fuels.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/Fuels.java index 01b1fa04b..ca25684e3 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/generator/Fuels.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/Fuels.java @@ -1,18 +1,18 @@ -package muramasa.gregtech.loader.machines.generator; +package org.gtreimagined.gt5r.loader.machines.generator; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.ingredient.FluidIngredient; import muramasa.antimatter.recipe.map.RecipeBuilder; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.Materials; import static muramasa.antimatter.data.AntimatterMaterialTypes.GAS; import static muramasa.antimatter.data.AntimatterMaterialTypes.LIQUID; -import static muramasa.gregtech.data.GT5RMaterialTags.SEMIFUELS; -import static muramasa.gregtech.data.Materials.Steam; -import static muramasa.gregtech.data.Materials.SuperheatedSteam; -import static muramasa.gregtech.data.RecipeMaps.*; +import static org.gtreimagined.gt5r.data.GT5RMaterialTags.SEMIFUELS; +import static org.gtreimagined.gt5r.data.Materials.Steam; +import static org.gtreimagined.gt5r.data.Materials.SuperheatedSteam; +import static org.gtreimagined.gt5r.data.RecipeMaps.*; public class Fuels { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/generator/LargeBoilerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/LargeBoilerLoader.java similarity index 86% rename from common/src/main/java/muramasa/gregtech/loader/machines/generator/LargeBoilerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/LargeBoilerLoader.java index 37891fd83..00ce233a0 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/generator/LargeBoilerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/LargeBoilerLoader.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.loader.machines.generator; +package org.gtreimagined.gt5r.loader.machines.generator; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.MaterialTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.data.RecipeMaps; +import org.gtreimagined.gt5r.data.RecipeMaps; import net.minecraft.resources.ResourceLocation; -import static muramasa.gregtech.data.GT5RMaterialTags.SEMIFUELS; +import static org.gtreimagined.gt5r.data.GT5RMaterialTags.SEMIFUELS; public class LargeBoilerLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/generator/SolidFuelBoilerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/SolidFuelBoilerLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/machines/generator/SolidFuelBoilerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/SolidFuelBoilerLoader.java index cbf172e8e..58e1e3d9b 100644 --- a/common/src/main/java/muramasa/gregtech/loader/machines/generator/SolidFuelBoilerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/machines/generator/SolidFuelBoilerLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.machines.generator; +package org.gtreimagined.gt5r.loader.machines.generator; import muramasa.antimatter.data.ForgeCTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; @@ -7,8 +7,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.SOLID_FUEL_BOILERS; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.SOLID_FUEL_BOILERS; public class SolidFuelBoilerLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/BlastFurnaceLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/BlastFurnaceLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/multi/BlastFurnaceLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/BlastFurnaceLoader.java index d6dca5989..6dbf94817 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/BlastFurnaceLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/BlastFurnaceLoader.java @@ -1,12 +1,12 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import com.google.common.collect.ImmutableMap; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.map.RecipeBuilder; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -15,9 +15,9 @@ import static muramasa.antimatter.data.AntimatterMaterials.Iron; import static muramasa.antimatter.material.MaterialTags.DIRECT_SMELT_INTO; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.E_BLAST_FURNACE; -import static muramasa.gregtech.data.RecipeMaps.PRIMITIVE_BLAST_FURNACE; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.E_BLAST_FURNACE; +import static org.gtreimagined.gt5r.data.RecipeMaps.PRIMITIVE_BLAST_FURNACE; import static org.gtreimagined.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS; public class BlastFurnaceLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/CokeOvenLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/CokeOvenLoader.java similarity index 92% rename from common/src/main/java/muramasa/gregtech/loader/multi/CokeOvenLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/CokeOvenLoader.java index 7041b50fb..1eb8cccb3 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/CokeOvenLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/CokeOvenLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; @@ -8,8 +8,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Coal; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.COKE_OVEN; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.COKE_OVEN; public class CokeOvenLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/CrackingUnitLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/CrackingUnitLoader.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/loader/multi/CrackingUnitLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/CrackingUnitLoader.java index 35620f09c..820f77584 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/CrackingUnitLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/CrackingUnitLoader.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST_TINY; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.CRACKING; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.CRACKING; public class CrackingUnitLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/DistillationTowerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/DistillationTowerLoader.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/loader/multi/DistillationTowerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/DistillationTowerLoader.java index 772f85154..b0109057a 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/DistillationTowerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/DistillationTowerLoader.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; +import org.gtreimagined.gt5r.GT5RConfig; +import org.gtreimagined.gt5r.material.FluidProduct; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.map.RecipeBuilder; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.material.FluidProduct; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.gtreimagined.gtcore.data.GTCoreFluids; @@ -13,8 +13,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST_SMALL; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.*; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.*; import static org.gtreimagined.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS; public class DistillationTowerLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/FusionReactorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/FusionReactorLoader.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/loader/multi/FusionReactorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/FusionReactorLoader.java index 28d841bab..48fd5366c 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/FusionReactorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/FusionReactorLoader.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import static muramasa.antimatter.Ref.L; import static muramasa.antimatter.data.AntimatterMaterials.Gold; import static muramasa.antimatter.data.AntimatterMaterials.Iron; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.FUSION; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.FUSION; import static org.gtreimagined.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS; public class FusionReactorLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/HeatExchangerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/HeatExchangerLoader.java similarity index 91% rename from common/src/main/java/muramasa/gregtech/loader/multi/HeatExchangerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/HeatExchangerLoader.java index a6b35009f..2a8ae7018 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/HeatExchangerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/HeatExchangerLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; import net.minecraft.world.item.Items; @@ -6,8 +6,8 @@ import tesseract.TesseractGraphWrappers; import static muramasa.antimatter.data.AntimatterMaterials.Lava; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.HEAT_EXCHANGER; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.HEAT_EXCHANGER; public class HeatExchangerLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/ImplosionCompressorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/ImplosionCompressorLoader.java similarity index 82% rename from common/src/main/java/muramasa/gregtech/loader/multi/ImplosionCompressorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/ImplosionCompressorLoader.java index 49f4f1cbc..bbde29b0b 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/ImplosionCompressorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/ImplosionCompressorLoader.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import net.minecraft.world.item.Items; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Diamond; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.IMPLOSION_COMPRESSOR; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.IMPLOSION_COMPRESSOR; public class ImplosionCompressorLoader { public static void init(){ diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOvenLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/PyrolysisOvenLoader.java similarity index 94% rename from common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOvenLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/PyrolysisOvenLoader.java index 1ca181127..d71ece7e9 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/PyrolysisOvenLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/PyrolysisOvenLoader.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; +import org.gtreimagined.gt5r.GT5RConfig; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; -import muramasa.gregtech.GT5RConfig; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -12,8 +12,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterialTypes.RAW_ORE; import static muramasa.antimatter.data.AntimatterMaterials.*; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.PYROLYSIS_OVEN; +import static org.gtreimagined.gt5r.data.Materials.*; +import static org.gtreimagined.gt5r.data.RecipeMaps.PYROLYSIS_OVEN; import static org.gtreimagined.gtcore.data.GTCoreItems.SELECTOR_TAG_INGREDIENTS; public class PyrolysisOvenLoader { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/TreeGrowthSimulatorLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/TreeGrowthSimulatorLoader.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/loader/multi/TreeGrowthSimulatorLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/TreeGrowthSimulatorLoader.java index cb85afcc0..de168144f 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/TreeGrowthSimulatorLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/TreeGrowthSimulatorLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.ItemStack; @@ -7,7 +7,7 @@ import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.data.AntimatterMaterials.Water; -import static muramasa.gregtech.data.RecipeMaps.TREE_GROWTH_SIMULATOR; +import static org.gtreimagined.gt5r.data.RecipeMaps.TREE_GROWTH_SIMULATOR; public class TreeGrowthSimulatorLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/loader/multi/VacuumFreezerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/VacuumFreezerLoader.java similarity index 81% rename from common/src/main/java/muramasa/gregtech/loader/multi/VacuumFreezerLoader.java rename to common/src/main/java/org/gtreimagined/gt5r/loader/multi/VacuumFreezerLoader.java index 46b1ce405..4d0a1b8cd 100644 --- a/common/src/main/java/muramasa/gregtech/loader/multi/VacuumFreezerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/VacuumFreezerLoader.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.loader.multi; +package org.gtreimagined.gt5r.loader.multi; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.Item; @@ -6,8 +6,8 @@ import static muramasa.antimatter.data.AntimatterMaterialTypes.INGOT; import static muramasa.antimatter.data.AntimatterMaterialTypes.INGOT_HOT; -import static muramasa.gregtech.data.Materials.Nitrogen; -import static muramasa.gregtech.data.RecipeMaps.VACUUM_FREEZER; +import static org.gtreimagined.gt5r.data.Materials.Nitrogen; +import static org.gtreimagined.gt5r.data.RecipeMaps.VACUUM_FREEZER; public class VacuumFreezerLoader { public static void init() { diff --git a/common/src/main/java/muramasa/gregtech/machine/ISecondaryOutputMachine.java b/common/src/main/java/org/gtreimagined/gt5r/machine/ISecondaryOutputMachine.java similarity index 77% rename from common/src/main/java/muramasa/gregtech/machine/ISecondaryOutputMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/ISecondaryOutputMachine.java index d4e1f057c..1dcf3acda 100644 --- a/common/src/main/java/muramasa/gregtech/machine/ISecondaryOutputMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/ISecondaryOutputMachine.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.machine; +package org.gtreimagined.gt5r.machine; import muramasa.antimatter.cover.CoverFactory; diff --git a/common/src/main/java/muramasa/gregtech/machine/MiniPortalMachine.java b/common/src/main/java/org/gtreimagined/gt5r/machine/MiniPortalMachine.java similarity index 87% rename from common/src/main/java/muramasa/gregtech/machine/MiniPortalMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/MiniPortalMachine.java index 9ac1a6436..2e08484e6 100644 --- a/common/src/main/java/muramasa/gregtech/machine/MiniPortalMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/MiniPortalMachine.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.machine; +package org.gtreimagined.gt5r.machine; +import org.gtreimagined.gt5r.GT5RRef; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.machine.MachineFlag; import muramasa.antimatter.machine.types.BasicMachine; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.data.Textures; +import org.gtreimagined.gt5r.data.Textures; import net.minecraft.resources.ResourceLocation; import static muramasa.antimatter.machine.MachineFlag.UNCULLED; diff --git a/common/src/main/java/muramasa/gregtech/machine/MultiblockTankMachine.java b/common/src/main/java/org/gtreimagined/gt5r/machine/MultiblockTankMachine.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/machine/MultiblockTankMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/MultiblockTankMachine.java index c0cad72c0..39fa488dd 100644 --- a/common/src/main/java/muramasa/gregtech/machine/MultiblockTankMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/MultiblockTankMachine.java @@ -1,6 +1,8 @@ -package muramasa.gregtech.machine; +package org.gtreimagined.gt5r.machine; import com.gtnewhorizon.structurelib.structure.StructureUtility; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.multi.BlockEntityLargeTank; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.machine.MachineFlag; import muramasa.antimatter.machine.Tier; @@ -8,8 +10,6 @@ import muramasa.antimatter.structure.FakeTileElement; import muramasa.antimatter.texture.Texture; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.multi.BlockEntityLargeTank; import org.gtreimagined.gtcore.machine.MaterialBasicMultiMachine; import static muramasa.antimatter.data.AntimatterMaterials.Wood; diff --git a/common/src/main/java/muramasa/gregtech/machine/SecondaryOutputMachine.java b/common/src/main/java/org/gtreimagined/gt5r/machine/SecondaryOutputMachine.java similarity index 86% rename from common/src/main/java/muramasa/gregtech/machine/SecondaryOutputMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/SecondaryOutputMachine.java index 7f2e93f9a..dbd3f9efd 100644 --- a/common/src/main/java/muramasa/gregtech/machine/SecondaryOutputMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/SecondaryOutputMachine.java @@ -1,9 +1,9 @@ -package muramasa.gregtech.machine; +package org.gtreimagined.gt5r.machine; +import org.gtreimagined.gt5r.blockentity.single.BlockEntitySecondaryOutput; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.cover.ICover; import muramasa.antimatter.machine.types.BasicMachine; -import muramasa.gregtech.blockentity.single.BlockEntitySecondaryOutput; public class SecondaryOutputMachine extends BasicMachine implements ISecondaryOutputMachine { protected CoverFactory secondaryOutputCover = ICover.emptyFactory; diff --git a/common/src/main/java/muramasa/gregtech/machine/SteamMachine.java b/common/src/main/java/org/gtreimagined/gt5r/machine/SteamMachine.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/machine/SteamMachine.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/SteamMachine.java index 5e24cfa9d..19c782ee9 100644 --- a/common/src/main/java/muramasa/gregtech/machine/SteamMachine.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/SteamMachine.java @@ -1,5 +1,6 @@ -package muramasa.gregtech.machine; +package org.gtreimagined.gt5r.machine; +import org.gtreimagined.gt5r.blockentity.single.BlockEntitySteamMachine; import muramasa.antimatter.Data; import muramasa.antimatter.gui.SlotData; import muramasa.antimatter.gui.SlotType; @@ -10,8 +11,7 @@ import muramasa.antimatter.gui.widget.TextWidget; import muramasa.antimatter.gui.widget.WidgetSupplier; import muramasa.antimatter.machine.types.Machine; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.single.BlockEntitySteamMachine; +import org.gtreimagined.gt5r.GT5RRef; import net.minecraft.resources.ResourceLocation; import java.util.List; diff --git a/common/src/main/java/muramasa/gregtech/machine/caps/ParallelRecipeHandler.java b/common/src/main/java/org/gtreimagined/gt5r/machine/caps/ParallelRecipeHandler.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/machine/caps/ParallelRecipeHandler.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/caps/ParallelRecipeHandler.java index c86786183..825534b78 100644 --- a/common/src/main/java/muramasa/gregtech/machine/caps/ParallelRecipeHandler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/caps/ParallelRecipeHandler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.machine.caps; +package org.gtreimagined.gt5r.machine.caps; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.Antimatter; diff --git a/common/src/main/java/muramasa/gregtech/machine/caps/SecondaryOutputCoverHandler.java b/common/src/main/java/org/gtreimagined/gt5r/machine/caps/SecondaryOutputCoverHandler.java similarity index 95% rename from common/src/main/java/muramasa/gregtech/machine/caps/SecondaryOutputCoverHandler.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/caps/SecondaryOutputCoverHandler.java index 6bbb0dac3..256ea3ba7 100644 --- a/common/src/main/java/muramasa/gregtech/machine/caps/SecondaryOutputCoverHandler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/caps/SecondaryOutputCoverHandler.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.machine.caps; +package org.gtreimagined.gt5r.machine.caps; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.machine.MachineCoverHandler; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.cover.ICover; -import muramasa.gregtech.machine.ISecondaryOutputMachine; +import org.gtreimagined.gt5r.machine.ISecondaryOutputMachine; import net.minecraft.core.Direction; import net.minecraft.world.entity.player.Player; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/machine/maps/DisassemblingMap.java b/common/src/main/java/org/gtreimagined/gt5r/machine/maps/DisassemblingMap.java similarity index 98% rename from common/src/main/java/muramasa/gregtech/machine/maps/DisassemblingMap.java rename to common/src/main/java/org/gtreimagined/gt5r/machine/maps/DisassemblingMap.java index 95af54d24..ef2c537d6 100644 --- a/common/src/main/java/muramasa/gregtech/machine/maps/DisassemblingMap.java +++ b/common/src/main/java/org/gtreimagined/gt5r/machine/maps/DisassemblingMap.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.machine.maps; +package org.gtreimagined.gt5r.machine.maps; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; diff --git a/common/src/main/java/muramasa/gregtech/material/FluidProduct.java b/common/src/main/java/org/gtreimagined/gt5r/material/FluidProduct.java similarity index 90% rename from common/src/main/java/muramasa/gregtech/material/FluidProduct.java rename to common/src/main/java/org/gtreimagined/gt5r/material/FluidProduct.java index 3b296a7f0..aa43c7c7e 100644 --- a/common/src/main/java/muramasa/gregtech/material/FluidProduct.java +++ b/common/src/main/java/org/gtreimagined/gt5r/material/FluidProduct.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.material; +package org.gtreimagined.gt5r.material; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.data.AntimatterMaterialTypes; diff --git a/common/src/main/java/muramasa/gregtech/material/GregTechMaterialEvent.java b/common/src/main/java/org/gtreimagined/gt5r/material/GregTechMaterialEvent.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/material/GregTechMaterialEvent.java rename to common/src/main/java/org/gtreimagined/gt5r/material/GregTechMaterialEvent.java index 675263a54..3d0a4478c 100644 --- a/common/src/main/java/muramasa/gregtech/material/GregTechMaterialEvent.java +++ b/common/src/main/java/org/gtreimagined/gt5r/material/GregTechMaterialEvent.java @@ -1,11 +1,11 @@ -package muramasa.gregtech.material; +package org.gtreimagined.gt5r.material; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.event.MaterialEvent; import muramasa.antimatter.material.IMaterialTag; import muramasa.antimatter.material.Material; import muramasa.antimatter.material.data.ToolData; -import muramasa.gregtech.data.GT5RMaterialTags; +import org.gtreimagined.gt5r.data.GT5RMaterialTags; import static muramasa.antimatter.material.MaterialTags.HAS_CUSTOM_SMELTING; import static muramasa.antimatter.material.MaterialTags.METAL; diff --git a/common/src/main/java/muramasa/gregtech/proxy/ClientHandler.java b/common/src/main/java/org/gtreimagined/gt5r/proxy/ClientHandler.java similarity index 88% rename from common/src/main/java/muramasa/gregtech/proxy/ClientHandler.java rename to common/src/main/java/org/gtreimagined/gt5r/proxy/ClientHandler.java index 15538c591..f7d4d650a 100644 --- a/common/src/main/java/muramasa/gregtech/proxy/ClientHandler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/proxy/ClientHandler.java @@ -1,14 +1,14 @@ -package muramasa.gregtech.proxy; +package org.gtreimagined.gt5r.proxy; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.data.Machines; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.client.ModelUtils; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.util.AntimatterPlatformUtils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.block.BlockCasing; -import muramasa.gregtech.block.BlockColoredWall; -import muramasa.gregtech.data.Machines; +import org.gtreimagined.gt5r.block.BlockCasing; +import org.gtreimagined.gt5r.block.BlockColoredWall; import net.minecraft.client.renderer.RenderType; import java.io.File; diff --git a/common/src/main/java/muramasa/gregtech/proxy/CommonHandler.java b/common/src/main/java/org/gtreimagined/gt5r/proxy/CommonHandler.java similarity index 65% rename from common/src/main/java/muramasa/gregtech/proxy/CommonHandler.java rename to common/src/main/java/org/gtreimagined/gt5r/proxy/CommonHandler.java index d38ff2c94..ceb76a0e3 100644 --- a/common/src/main/java/muramasa/gregtech/proxy/CommonHandler.java +++ b/common/src/main/java/org/gtreimagined/gt5r/proxy/CommonHandler.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.proxy; +package org.gtreimagined.gt5r.proxy; public class CommonHandler { diff --git a/common/src/main/java/muramasa/gregtech/worldgen/OilSpoutEntry.java b/common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutEntry.java similarity index 97% rename from common/src/main/java/muramasa/gregtech/worldgen/OilSpoutEntry.java rename to common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutEntry.java index 1507f138c..51339a31e 100644 --- a/common/src/main/java/muramasa/gregtech/worldgen/OilSpoutEntry.java +++ b/common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutEntry.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.worldgen; +package org.gtreimagined.gt5r.worldgen; import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/muramasa/gregtech/worldgen/OilSpoutFluid.java b/common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutFluid.java similarity index 96% rename from common/src/main/java/muramasa/gregtech/worldgen/OilSpoutFluid.java rename to common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutFluid.java index ba7c780d5..119fe6139 100644 --- a/common/src/main/java/muramasa/gregtech/worldgen/OilSpoutFluid.java +++ b/common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutFluid.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.worldgen; +package org.gtreimagined.gt5r.worldgen; import net.minecraft.world.level.material.Fluid; diff --git a/common/src/main/java/muramasa/gregtech/worldgen/OilSpoutSavedData.java b/common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutSavedData.java similarity index 99% rename from common/src/main/java/muramasa/gregtech/worldgen/OilSpoutSavedData.java rename to common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutSavedData.java index faa9ae353..055643fef 100644 --- a/common/src/main/java/muramasa/gregtech/worldgen/OilSpoutSavedData.java +++ b/common/src/main/java/org/gtreimagined/gt5r/worldgen/OilSpoutSavedData.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.worldgen; +package org.gtreimagined.gt5r.worldgen; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import muramasa.antimatter.util.XSTR; diff --git a/fabric/src/main/java/muramasa/gregtech/client/fabric/GT5RFabricClient.java b/fabric/src/main/java/org/gtreimagined/gt5r/client/fabric/GT5RFabricClient.java similarity index 71% rename from fabric/src/main/java/muramasa/gregtech/client/fabric/GT5RFabricClient.java rename to fabric/src/main/java/org/gtreimagined/gt5r/client/fabric/GT5RFabricClient.java index 4603fcd1c..26c3721c2 100644 --- a/fabric/src/main/java/muramasa/gregtech/client/fabric/GT5RFabricClient.java +++ b/fabric/src/main/java/org/gtreimagined/gt5r/client/fabric/GT5RFabricClient.java @@ -1,7 +1,7 @@ -package muramasa.gregtech.client.fabric; +package org.gtreimagined.gt5r.client.fabric; import muramasa.antimatter.client.fabric.IAntimatterClientInitializer; -import muramasa.gregtech.proxy.ClientHandler; +import org.gtreimagined.gt5r.proxy.ClientHandler; public class GT5RFabricClient implements IAntimatterClientInitializer { @Override diff --git a/fabric/src/main/java/muramasa/gregtech/fabric/GT5RFabric.java b/fabric/src/main/java/org/gtreimagined/gt5r/fabric/GT5RFabric.java similarity index 93% rename from fabric/src/main/java/muramasa/gregtech/fabric/GT5RFabric.java rename to fabric/src/main/java/org/gtreimagined/gt5r/fabric/GT5RFabric.java index 474ff7799..cdd4b9010 100644 --- a/fabric/src/main/java/muramasa/gregtech/fabric/GT5RFabric.java +++ b/fabric/src/main/java/org/gtreimagined/gt5r/fabric/GT5RFabric.java @@ -1,13 +1,13 @@ -package muramasa.gregtech.fabric; +package org.gtreimagined.gt5r.fabric; import muramasa.antimatter.event.fabric.CraftingEvents; import muramasa.antimatter.event.fabric.LoaderEvents; import muramasa.antimatter.event.fabric.ProviderEvents; import muramasa.antimatter.event.fabric.WorldGenEvents; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.blockentity.miniportals.BlockEntityMiniPortal; -import muramasa.gregtech.blockentity.multi.MiningPipeStructureCache; -import muramasa.gregtech.loader.WorldGenLoader; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.blockentity.miniportals.BlockEntityMiniPortal; +import org.gtreimagined.gt5r.blockentity.multi.MiningPipeStructureCache; +import org.gtreimagined.gt5r.loader.WorldGenLoader; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; diff --git a/forge/src/main/java/muramasa/gregtech/events/forge/RemappingEvents.java b/forge/src/main/java/org/gtreimagined/gt5r/events/forge/RemappingEvents.java similarity index 98% rename from forge/src/main/java/muramasa/gregtech/events/forge/RemappingEvents.java rename to forge/src/main/java/org/gtreimagined/gt5r/events/forge/RemappingEvents.java index 3b98a607a..260077db8 100644 --- a/forge/src/main/java/muramasa/gregtech/events/forge/RemappingEvents.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/events/forge/RemappingEvents.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.events.forge; +package org.gtreimagined.gt5r.events.forge; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterRemapping; @@ -8,10 +8,10 @@ import muramasa.antimatter.fluid.AntimatterFluid; import muramasa.antimatter.material.Material; import muramasa.antimatter.ore.BlockOre; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.blockentity.miniportals.BlockEntityMiniPortal; -import muramasa.gregtech.blockentity.multi.MiningPipeStructureCache; -import muramasa.gregtech.data.Materials; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.blockentity.miniportals.BlockEntityMiniPortal; +import org.gtreimagined.gt5r.blockentity.multi.MiningPipeStructureCache; +import org.gtreimagined.gt5r.data.Materials; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; diff --git a/forge/src/main/java/muramasa/gregtech/forge/GT5RForge.java b/forge/src/main/java/org/gtreimagined/gt5r/forge/GT5RForge.java similarity index 83% rename from forge/src/main/java/muramasa/gregtech/forge/GT5RForge.java rename to forge/src/main/java/org/gtreimagined/gt5r/forge/GT5RForge.java index 07d64c804..965aa0043 100644 --- a/forge/src/main/java/muramasa/gregtech/forge/GT5RForge.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/forge/GT5RForge.java @@ -1,16 +1,16 @@ -package muramasa.gregtech.forge; +package org.gtreimagined.gt5r.forge; import muramasa.antimatter.event.forge.AntimatterCraftingEvent; import muramasa.antimatter.event.forge.AntimatterLoaderEvent; import muramasa.antimatter.event.forge.AntimatterProvidersEvent; import muramasa.antimatter.event.forge.AntimatterWorldGenEvent; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.GT5RPostRegistrar; -import muramasa.gregtech.events.forge.RemappingEvents; -import muramasa.gregtech.integration.forge.tfc.TFCRegistrar; -import muramasa.gregtech.loader.WorldGenLoader; -import muramasa.gregtech.proxy.ClientHandler; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.GT5RRef; +import org.gtreimagined.gt5r.GT5RPostRegistrar; +import org.gtreimagined.gt5r.events.forge.RemappingEvents; +import org.gtreimagined.gt5r.integration.forge.tfc.TFCRegistrar; +import org.gtreimagined.gt5r.loader.WorldGenLoader; +import org.gtreimagined.gt5r.proxy.ClientHandler; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; diff --git a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/MachineRecipes.java b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/MachineRecipes.java similarity index 95% rename from forge/src/main/java/muramasa/gregtech/integration/forge/tfc/MachineRecipes.java rename to forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/MachineRecipes.java index a1a438006..e5509c092 100644 --- a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/MachineRecipes.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/MachineRecipes.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.forge.tfc; +package org.gtreimagined.gt5r.integration.forge.tfc; import muramasa.antimatter.Ref; @@ -8,9 +8,9 @@ import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; import muramasa.antimatter.util.Utils; -import muramasa.gregtech.GT5Reimagined; -import muramasa.gregtech.data.RecipeMaps; -import muramasa.gregtech.loader.machines.CutterLoader; +import org.gtreimagined.gt5r.GT5Reimagined; +import org.gtreimagined.gt5r.data.RecipeMaps; +import org.gtreimagined.gt5r.loader.machines.CutterLoader; import net.dries007.tfc.common.blocks.rock.Ore; import net.dries007.tfc.common.items.TFCItems; import net.dries007.tfc.util.Helpers; @@ -24,8 +24,7 @@ import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.material.MaterialTags.MACERATE_INTO; import static muramasa.antimatter.material.MaterialTags.ORE_MULTI; -import static muramasa.gregtech.data.Materials.*; -import static muramasa.gregtech.data.RecipeMaps.FLUID_PRESS; +import static org.gtreimagined.gt5r.data.RecipeMaps.FLUID_PRESS; import static net.dries007.tfc.common.blocks.rock.Ore.*; public class MachineRecipes { diff --git a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/TFCRegistrar.java b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/TFCRegistrar.java similarity index 96% rename from forge/src/main/java/muramasa/gregtech/integration/forge/tfc/TFCRegistrar.java rename to forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/TFCRegistrar.java index c9bdad356..3c4f066a1 100644 --- a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/TFCRegistrar.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/TFCRegistrar.java @@ -1,5 +1,8 @@ -package muramasa.gregtech.integration.forge.tfc; +package org.gtreimagined.gt5r.integration.forge.tfc; +import org.gtreimagined.gt5r.integration.forge.tfc.datagen.TFCBlockTagProvider; +import org.gtreimagined.gt5r.integration.forge.tfc.datagen.TFCItemTagProvider; +import org.gtreimagined.gt5r.integration.forge.tfc.datagen.TFCLangProvider; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -23,10 +26,7 @@ import muramasa.antimatter.tool.behaviour.BehaviourVanillaShovel; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; -import muramasa.gregtech.GT5RRef; -import muramasa.gregtech.integration.forge.tfc.datagen.TFCBlockTagProvider; -import muramasa.gregtech.integration.forge.tfc.datagen.TFCItemTagProvider; -import muramasa.gregtech.integration.forge.tfc.datagen.TFCLangProvider; +import org.gtreimagined.gt5r.GT5RRef; import net.dries007.tfc.common.blocks.rock.Rock; import net.dries007.tfc.common.blocks.soil.SandBlockType; import net.dries007.tfc.common.blocks.soil.SoilBlockType; @@ -43,7 +43,6 @@ import java.util.function.BiConsumer; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; -import static muramasa.gregtech.data.Materials.*; import static net.dries007.tfc.common.blocks.soil.SoilBlockType.GRASS_PATH; public class TFCRegistrar implements IAntimatterRegistrar { diff --git a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCBlockTagProvider.java b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCBlockTagProvider.java similarity index 97% rename from forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCBlockTagProvider.java rename to forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCBlockTagProvider.java index fce43bc8e..57db53778 100644 --- a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCBlockTagProvider.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCBlockTagProvider.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.forge.tfc.datagen; +package org.gtreimagined.gt5r.integration.forge.tfc.datagen; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider; diff --git a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCItemTagProvider.java b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCItemTagProvider.java similarity index 96% rename from forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCItemTagProvider.java rename to forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCItemTagProvider.java index c19eea1e4..7ce96487d 100644 --- a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCItemTagProvider.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCItemTagProvider.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.forge.tfc.datagen; +package org.gtreimagined.gt5r.integration.forge.tfc.datagen; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; @@ -13,7 +13,6 @@ import static muramasa.antimatter.data.AntimatterDefaultTools.*; import static muramasa.antimatter.data.AntimatterMaterials.Copper; -import static muramasa.gregtech.data.Materials.*; public class TFCItemTagProvider extends AntimatterItemTagProvider { public TFCItemTagProvider(String providerDomain, String providerName, boolean replace, AntimatterBlockTagProvider p) { diff --git a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCLangProvider.java b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCLangProvider.java similarity index 76% rename from forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCLangProvider.java rename to forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCLangProvider.java index 322560af7..c46d1a45b 100644 --- a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/datagen/TFCLangProvider.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/datagen/TFCLangProvider.java @@ -1,10 +1,9 @@ -package muramasa.gregtech.integration.forge.tfc.datagen; +package org.gtreimagined.gt5r.integration.forge.tfc.datagen; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterLanguageProvider; -import muramasa.antimatter.item.ItemBasic; -import muramasa.gregtech.integration.forge.tfc.ore.GTTFCOreBlock; -import muramasa.gregtech.integration.forge.tfc.ore.GTTFCOreItem; +import org.gtreimagined.gt5r.integration.forge.tfc.ore.GTTFCOreBlock; +import org.gtreimagined.gt5r.integration.forge.tfc.ore.GTTFCOreItem; import static muramasa.antimatter.util.Utils.lowerUnderscoreToUpperSpaced; diff --git a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/ore/GTTFCOreBlock.java b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/ore/GTTFCOreBlock.java similarity index 94% rename from forge/src/main/java/muramasa/gregtech/integration/forge/tfc/ore/GTTFCOreBlock.java rename to forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/ore/GTTFCOreBlock.java index 955a51247..6946999b4 100644 --- a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/ore/GTTFCOreBlock.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/ore/GTTFCOreBlock.java @@ -1,10 +1,10 @@ -package muramasa.gregtech.integration.forge.tfc.ore; +package org.gtreimagined.gt5r.integration.forge.tfc.ore; import muramasa.antimatter.Ref; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; -import muramasa.gregtech.GT5RRef; +import org.gtreimagined.gt5r.GT5RRef; import net.dries007.tfc.common.blocks.rock.Ore; import net.dries007.tfc.common.blocks.rock.Rock; import net.minecraft.world.level.block.SoundType; diff --git a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/ore/GTTFCOreItem.java b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/ore/GTTFCOreItem.java similarity index 86% rename from forge/src/main/java/muramasa/gregtech/integration/forge/tfc/ore/GTTFCOreItem.java rename to forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/ore/GTTFCOreItem.java index c0b7fde87..f6a0a68bc 100644 --- a/forge/src/main/java/muramasa/gregtech/integration/forge/tfc/ore/GTTFCOreItem.java +++ b/forge/src/main/java/org/gtreimagined/gt5r/integration/forge/tfc/ore/GTTFCOreItem.java @@ -1,4 +1,4 @@ -package muramasa.gregtech.integration.forge.tfc.ore; +package org.gtreimagined.gt5r.integration.forge.tfc.ore; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.texture.Texture;