From 52c67d8fe8df8159b99d2020d23b263358fcca0a Mon Sep 17 00:00:00 2001 From: MasterEnderman Date: Tue, 19 Mar 2024 21:38:38 +0100 Subject: [PATCH] finished update to Vintage GregTech and the newest IC2C version --- CHANGELOG.md | 423 +----------------- build.gradle | 292 +++++++----- dependencies.gradle | 65 +++ gradle.properties | 61 ++- gradle/wrapper/gradle-wrapper.jar | Bin 56172 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- settings.gradle | 25 ++ .../GTCExpansion.java | 6 +- .../GTCXConfiguration.java | 0 .../GTCXCrops.java | 0 .../GTCXFluids.java | 0 .../GTCXIcons.java | 0 .../GTCXJei.java | 0 .../GTCXMachineGui.java | 0 .../GTCXOreDict.java | 0 .../GTCXPlugin.java | 0 .../GTCXWorldGen.java | 0 .../GTCXWorldGenTwilightForest.java | 0 .../block/GTCXBlockCasing.java | 0 .../block/GTCXBlockDummyCover.java | 0 .../block/GTCXBlockHatch.java | 0 .../block/GTCXBlockLVMachine.java | 0 .../block/GTCXBlockMisc.java | 5 +- .../block/GTCXBlockOre.java | 0 .../block/GTCXBlockOreBedrock.java | 0 .../block/GTCXBlockPipe.java | 0 .../block/GTCXBlockPipeFluid.java | 0 .../block/GTCXBlockPipeItem.java | 0 .../block/GTCXBlockStorage.java | 0 .../block/GTCXBlockTile.java | 0 .../block/GTCXBlockWire.java | 2 +- .../block/GTCXCropBlock.java | 0 .../block/GTCXCropOilberry.java | 0 .../container/GTCXContainerAlloyFurnace.java | 0 .../container/GTCXContainerAlloySmelter.java | 0 .../GTCXContainerAssemblingMachine.java | 0 .../container/GTCXContainerBath.java | 0 .../GTCXContainerBurnableFluidGenerator.java | 0 .../container/GTCXContainerCentrifuge.java | 0 .../GTCXContainerChemicalReactor.java | 0 .../container/GTCXContainerCoalBoiler.java | 0 .../container/GTCXContainerCokeOven.java | 0 .../container/GTCXContainerDigitalTank.java | 0 .../GTCXContainerDistillationTower.java | 0 .../container/GTCXContainerDustbin.java | 0 .../container/GTCXContainerElectrolyzer.java | 0 .../container/GTCXContainerExtruder.java | 0 .../container/GTCXContainerFluidCaster.java | 0 .../container/GTCXContainerFluidSmelter.java | 0 .../container/GTCXContainerFusionReactor.java | 0 .../GTCXContainerFusionReactorHatch.java | 0 .../GTCXContainerImplosionCompressor.java | 0 .../GTCXContainerIndustrialBlastFurnace.java | 0 .../GTCXContainerIndustrialGrinder.java | 0 .../GTCXContainerIndustrialSawmill.java | 0 .../GTCXContainerItemFluidHatch.java | 0 .../GTCXContainerLargeGasTurbine.java | 0 .../GTCXContainerLargeGasTurbineHatch.java | 0 .../GTCXContainerLargeSteamTurbine.java | 0 .../GTCXContainerLargeSteamTurbineHatch.java | 0 .../container/GTCXContainerLathe.java | 0 .../container/GTCXContainerLocker.java | 0 .../container/GTCXContainerMicrowave.java | 0 .../container/GTCXContainerPlateBender.java | 0 .../container/GTCXContainerPlateCutter.java | 0 .../GTCXContainerPrimitiveBlastFurnace.java | 0 .../container/GTCXContainerScanner.java | 0 .../GTCXContainerSteamAlloySmelter.java | 0 .../GTCXContainerSteamCompressor.java | 0 .../GTCXContainerSteamExtractor.java | 0 .../GTCXContainerSteamForgeHammer.java | 0 .../container/GTCXContainerSteamFurnace.java | 0 .../GTCXContainerSteamMacerator.java | 0 .../GTCXContainerStoneCompressor.java | 0 .../GTCXContainerStoneExtractor.java | 0 .../container/GTCXContainerThermalBoiler.java | 0 .../GTCXContainerThermalBoilerHatch.java | 0 .../container/GTCXContainerTrashBin.java | 0 .../container/GTCXContainerVacuumFreezer.java | 0 .../container/GTCXContainerWiremill.java | 0 .../crafttweaker/GTCXAlloySmelterSupport.java | 0 .../GTCXAssemblingMachineSupport.java | 0 .../crafttweaker/GTCXBlastFurnaceSupport.java | 0 .../crafttweaker/GTCXCentrifugeSupport.java | 0 .../GTCXChemicalReactorSupport.java | 0 .../GTCXDieselGeneratorSupport.java | 0 .../GTCXDistillationTowerSupport.java | 0 .../crafttweaker/GTCXElectrolyzerSupport.java | 0 .../crafttweaker/GTCXExtruderSupport.java | 0 .../crafttweaker/GTCXFluidCasterSupport.java | 0 .../crafttweaker/GTCXFluidSmelterSupport.java | 0 .../crafttweaker/GTCXForgeHammerSupport.java | 0 .../crafttweaker/GTCXFusionSupport.java | 0 .../crafttweaker/GTCXGasTurbineSupport.java | 0 .../GTCXImplosionCompressorSupport.java | 0 .../GTCXIndustrialGrinderSupport.java | 0 .../GTCXIndustrialSawmillSupport.java | 0 .../crafttweaker/GTCXLatheSupport.java | 0 .../crafttweaker/GTCXPlateBenderSupport.java | 0 .../crafttweaker/GTCXPlateCutterSupport.java | 0 .../crafttweaker/GTCXRadiationSupport.java | 0 .../GTCXVacuumFreezerSupport.java | 0 .../crafttweaker/GTCXWiremillSupport.java | 0 .../data/GTCXBlocks.java | 0 .../data/GTCXItems.java | 0 .../data/GTCXLang.java | 0 .../data/GTCXPipes.java | 0 .../data/GTCXValues.java | 0 .../entity/GTCXEntityElectricBoat.java | 0 .../events/GTCXOtherEvents.java | 0 .../events/GTCXRadiationEvent.java | 0 .../events/GTCXServerTickEvent.java | 0 .../gui/GTCXGuiCompCoalBoiler.java | 0 .../gui/GTCXGuiCompDigitalTank.java | 0 .../gui/GTCXGuiCompFusionButtons.java | 0 .../gui/GTCXGuiCompFusionOverlay.java | 0 .../gui/GTCXGuiCompMachineSteam.java | 0 ...GTCXGuiCompMultiblockProductionString.java | 0 .../GTCXGuiCompMultiblockStatusString.java | 0 .../gui/GTCXGuiICompFluidSmelterString.java | 0 .../gui/GTCXGuiICompIBFString.java | 0 .../interfaces/IGTCapabilityTile.java | 0 .../interfaces/IGTCasingBackgroundBlock.java | 0 .../interfaces/IGTCoverBlock.java | 0 .../interfaces/IGTEnergySource.java | 0 .../interfaces/IGTMultiTileProduction.java | 0 .../interfaces/IGTOwnerTile.java | 0 .../interfaces/IGTScrewdriver.java | 0 .../interfaces/IGTTextureStorageTile.java | 0 .../interfaces/IGTWrench.java | 0 .../item/GTCXItemBatteryReusable.java | 0 .../item/GTCXItemBatterySingleUse.java | 0 .../item/GTCXItemContainerDamageless.java | 0 .../item/GTCXItemCover.java | 0 .../item/GTCXItemDamageable.java | 0 .../item/GTCXItemDataOrbStorage.java | 0 .../item/GTCXItemDiamondChainsaw.java | 0 .../item/GTCXItemElectricScrewdriver.java | 0 .../item/GTCXItemFood.java | 0 .../item/GTCXItemHardeningSpray.java | 0 .../item/GTCXItemInsulationCutter.java | 0 .../item/GTCXItemIntegratedCircuit.java | 0 .../item/GTCXItemMatch.java | 0 .../item/GTCXItemMatchBox.java | 0 .../item/GTCXItemMisc.java | 0 .../item/GTCXItemMiscSpriteless.java | 0 .../item/GTCXItemMold.java | 0 .../item/GTCXItemSteelJackHammer.java | 0 .../item/GTCXItemTurbineRotor.java | 0 .../item/itemblock/GTCXColorItemBlock.java | 0 .../item/itemblock/GTCXItemBlockPipe.java | 0 .../overrides/GTCXItemBlockMachineLV.java | 0 .../item/overrides/GTCXItemDrill.java | 0 .../item/overrides/GTCXItemElectricBoat.java | 0 .../overrides/GTCXItemElectricWrench.java | 0 .../overrides/GTCXItemPrecisionWrench.java | 0 .../item/overrides/GTCXItemUpgrade.java | 0 .../item/tools/GTCXItemToolAxe.java | 0 .../item/tools/GTCXItemToolBranchCutter.java | 0 .../item/tools/GTCXItemToolCrowbar.java | 0 .../item/tools/GTCXItemToolFile.java | 0 .../item/tools/GTCXItemToolHammer.java | 0 .../item/tools/GTCXItemToolPickaxe.java | 0 .../item/tools/GTCXItemToolSaw.java | 0 .../item/tools/GTCXItemToolScrewdriver.java | 0 .../item/tools/GTCXItemToolShovel.java | 0 .../item/tools/GTCXItemToolSword.java | 0 .../item/tools/GTCXItemToolWrench.java | 0 .../item/tools/GTCXToolGen.java | 0 .../item/tools/GTCXToolMaterial.java | 0 .../jei/GTCXJeiPlugin.java | 0 .../GTCXJeiBurnableFluidCategory.java | 0 .../jei/category/GTCXJeiCauldronCategory.java | 0 .../jei/category/GTCXJeiCustomCategory.java | 0 .../GTCXJeiIntegratedCircuitCategory.java | 0 .../wrapper/GTCXJeiBurnableFluidWrapper.java | 0 .../jei/wrapper/GTCXJeiCasterWrapper.java | 0 .../jei/wrapper/GTCXJeiFusionWrapper.java | 0 .../jei/wrapper/GTCXJeiHeatWrapper.java | 0 .../GTCXJeiIntegratedCircuitWrapper.java | 0 .../logic/GTCXBaseCoverLogic.java | 0 .../logic/GTCXConveyorModuleLogic.java | 0 .../logic/GTCXDrainModuleLogic.java | 0 .../logic/GTCXFluidFilterLogic.java | 0 .../logic/GTCXItemValveModuleLogic.java | 0 .../logic/GTCXNullLogic.java | 0 .../logic/GTCXPumpModuleLogic.java | 0 .../logic/GTCXRedstoneControllerLogic.java | 0 .../logic/GTCXShutterLogic.java | 0 .../material/GTCXMaterial.java | 0 .../material/GTCXMaterialDict.java | 0 .../material/GTCXMaterialGen.java | 0 .../material/GTCXMaterialItemHot.java | 0 .../java/gtc_expansion/mixin/LateMixin.java | 20 + .../model/GTCXModelCasing.java | 0 .../model/GTCXModelHatch.java | 0 .../model/GTCXModelPipe.java | 0 .../model/GTCXModelPipeFullBlock.java | 0 .../model/GTModelLayeredAnchoredWire.java | 0 .../oneprobe/GTCXOneProbePlugin.java | 0 .../oneprobe/GTCXProbeHandler.java | 0 .../oneprobe/GTCXProbeModule.java | 0 .../proxy/GTCXClientProxy.java | 0 .../proxy/GTCXCommonProxy.java | 0 .../recipes/GTCXRecipe.java | 0 .../recipes/GTCXRecipeIterators.java | 0 .../recipes/GTCXRecipeLists.java | 0 .../recipes/GTCXRecipeMods.java | 0 .../recipes/GTCXRecipeProcessing.java | 0 .../recipes/GTCXRecipeRemove.java | 0 .../render/GTCXGuiFirstLoad.java | 2 +- .../render/GTCXOverlay.java | 0 .../render/GTCXRenderer.java | 0 .../render/Matrix4.java | 0 .../render/Transformation.java | 0 .../tile/GTCXTileAdvancedWorktable.java | 0 .../tile/GTCXTileAlloyFurnace.java | 0 .../tile/GTCXTileAlloySmelter.java | 0 .../tile/GTCXTileAssemblingMachine.java | 0 .../tile/GTCXTileBath.java | 0 .../tile/GTCXTileBrick.java | 0 .../tile/GTCXTileCasing.java | 0 .../tile/GTCXTileCentrifuge.java | 0 .../tile/GTCXTileChemicalReactor.java | 0 .../tile/GTCXTileDieselGenerator.java | 0 .../tile/GTCXTileDigitalTank.java | 0 .../tile/GTCXTileDustbin.java | 0 .../tile/GTCXTileElectricLocker.java | 0 .../tile/GTCXTileElectrolyzer.java | 0 .../tile/GTCXTileExtruder.java | 0 .../tile/GTCXTileFluidCaster.java | 0 .../tile/GTCXTileFluidSmelter.java | 0 .../tile/GTCXTileGasTurbine.java | 0 .../tile/GTCXTileLathe.java | 0 .../tile/GTCXTileLocker.java | 0 .../tile/GTCXTileMicrowave.java | 0 .../tile/GTCXTilePlateBender.java | 0 .../tile/GTCXTilePlateCutter.java | 0 .../tile/GTCXTileStoneCompressor.java | 0 .../tile/GTCXTileStoneExtractor.java | 0 .../tile/GTCXTileTrashBin.java | 0 .../tile/GTCXTileWiremill.java | 0 .../GTCXTileBaseBurnableFluidGenerator.java | 0 .../tile/base/GTCXTileBaseSteamMachine.java | 0 .../base/GTCXTileMultiBaseMachineAdv.java | 0 .../tile/hatch/GTCXTileEnergyOutputHatch.java | 0 .../hatch/GTCXTileFusionEnergyInjector.java | 0 .../tile/hatch/GTCXTileItemFluidHatches.java | 0 .../hatch/GTCXTileMachineControlHatch.java | 0 .../tile/multi/GTCXTileMultiCokeOven.java | 0 .../multi/GTCXTileMultiDistillationTower.java | 0 .../multi/GTCXTileMultiFusionReactor.java | 0 .../GTCXTileMultiImplosionCompressor.java | 0 .../GTCXTileMultiIndustrialBlastFurnace.java | 0 .../multi/GTCXTileMultiIndustrialGrinder.java | 0 .../multi/GTCXTileMultiIndustrialSawmill.java | 0 .../multi/GTCXTileMultiLargeGasTurbine.java | 0 .../multi/GTCXTileMultiLargeSteamTurbine.java | 0 .../GTCXTileMultiPrimitiveBlastFurnace.java | 0 .../multi/GTCXTileMultiThermalBoiler.java | 0 .../multi/GTCXTileMultiVacuumFreezer.java | 0 .../tile/overrides/GTCXTileScanner.java | 0 .../tile/pipes/GTCXTileBaseFluidPipe.java | 0 .../tile/pipes/GTCXTileBaseItemPipe.java | 0 .../tile/pipes/GTCXTileBasePipe.java | 0 .../tile/pipes/GTCXTileQuadFluidPipe.java | 0 .../tile/steam/GTCXTileCoalBoiler.java | 0 .../tile/steam/GTCXTileSteamAlloySmelter.java | 0 .../tile/steam/GTCXTileSteamCompressor.java | 0 .../tile/steam/GTCXTileSteamExtractor.java | 0 .../tile/steam/GTCXTileSteamForgeHammer.java | 0 .../tile/steam/GTCXTileSteamFurnace.java | 0 .../tile/steam/GTCXTileSteamMacerator.java | 0 .../tile/wiring/GTCXTileAluminiumCable.java | 0 .../tile/wiring/GTCXTileColoredCable.java | 0 .../tile/wiring/GTCXTileElectrumCable.java | 0 .../util/CoverStorage.java | 0 .../util/EnergyConsumer.java | 0 .../util/GTCXBatteryInput.java | 0 .../util/GTCXBedrockOreHandler.java | 0 .../util/GTCXBetterPipesCompat.java | 0 .../util/GTCXCropHandler.java | 0 .../util/GTCXDustbinFilter.java | 0 .../util/GTCXHelperPipe.java | 0 .../util/GTCXIc2cECompat.java | 0 .../util/GTCXMaterialWrench.java | 0 .../util/GTCXPassiveMachineFilter.java | 0 .../util/GTCXRecipeInputIngredient.java | 0 .../util/GTCXScannerFilter.java | 0 .../util/GTCXSteamMachineFilter.java | 0 .../util/GTCXTank.java | 0 .../util/GTCXWrenchUtils.java | 0 .../util/MultiBlockHelper.java | 0 .../util/RotationHelper.java | 0 src/main/resources/icon.png | Bin 0 -> 2781 bytes src/main/resources/mcmod.info | 31 +- 296 files changed, 381 insertions(+), 554 deletions(-) mode change 100755 => 100644 build.gradle create mode 100644 dependencies.gradle create mode 100644 settings.gradle rename src/main/java/{vgt_expansion => gtc_expansion}/GTCExpansion.java (92%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXConfiguration.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXCrops.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXFluids.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXIcons.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXJei.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXMachineGui.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXOreDict.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXPlugin.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXWorldGen.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/GTCXWorldGenTwilightForest.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockCasing.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockDummyCover.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockLVMachine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockMisc.java (96%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockOre.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockOreBedrock.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockPipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockPipeFluid.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockPipeItem.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockStorage.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockTile.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXBlockWire.java (99%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXCropBlock.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/block/GTCXCropOilberry.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerAlloyFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerAlloySmelter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerAssemblingMachine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerBath.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerBurnableFluidGenerator.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerCentrifuge.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerChemicalReactor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerCoalBoiler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerCokeOven.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerDigitalTank.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerDistillationTower.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerDustbin.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerElectrolyzer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerExtruder.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerFluidCaster.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerFluidSmelter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerFusionReactor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerFusionReactorHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerImplosionCompressor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerIndustrialBlastFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerIndustrialGrinder.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerIndustrialSawmill.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerItemFluidHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerLargeGasTurbine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerLargeGasTurbineHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerLargeSteamTurbine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerLargeSteamTurbineHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerLathe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerLocker.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerMicrowave.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerPlateBender.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerPlateCutter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerPrimitiveBlastFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerScanner.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerSteamAlloySmelter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerSteamCompressor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerSteamExtractor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerSteamForgeHammer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerSteamFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerSteamMacerator.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerStoneCompressor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerStoneExtractor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerThermalBoiler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerThermalBoilerHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerTrashBin.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerVacuumFreezer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/container/GTCXContainerWiremill.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXAlloySmelterSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXAssemblingMachineSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXBlastFurnaceSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXCentrifugeSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXChemicalReactorSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXDieselGeneratorSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXDistillationTowerSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXElectrolyzerSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXExtruderSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXFluidCasterSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXFluidSmelterSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXForgeHammerSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXFusionSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXGasTurbineSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXImplosionCompressorSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXIndustrialGrinderSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXIndustrialSawmillSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXLatheSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXPlateBenderSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXPlateCutterSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXRadiationSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXVacuumFreezerSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/crafttweaker/GTCXWiremillSupport.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/data/GTCXBlocks.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/data/GTCXItems.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/data/GTCXLang.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/data/GTCXPipes.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/data/GTCXValues.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/entity/GTCXEntityElectricBoat.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/events/GTCXOtherEvents.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/events/GTCXRadiationEvent.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/events/GTCXServerTickEvent.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiCompCoalBoiler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiCompDigitalTank.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiCompFusionButtons.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiCompFusionOverlay.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiCompMachineSteam.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiCompMultiblockProductionString.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiCompMultiblockStatusString.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiICompFluidSmelterString.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/gui/GTCXGuiICompIBFString.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTCapabilityTile.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTCasingBackgroundBlock.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTCoverBlock.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTEnergySource.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTMultiTileProduction.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTOwnerTile.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTScrewdriver.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTTextureStorageTile.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/interfaces/IGTWrench.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemBatteryReusable.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemBatterySingleUse.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemContainerDamageless.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemCover.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemDamageable.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemDataOrbStorage.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemDiamondChainsaw.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemElectricScrewdriver.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemFood.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemHardeningSpray.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemInsulationCutter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemIntegratedCircuit.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemMatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemMatchBox.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemMisc.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemMiscSpriteless.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemMold.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemSteelJackHammer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/GTCXItemTurbineRotor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/itemblock/GTCXColorItemBlock.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/itemblock/GTCXItemBlockPipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/overrides/GTCXItemBlockMachineLV.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/overrides/GTCXItemDrill.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/overrides/GTCXItemElectricBoat.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/overrides/GTCXItemElectricWrench.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/overrides/GTCXItemPrecisionWrench.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/overrides/GTCXItemUpgrade.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolAxe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolBranchCutter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolCrowbar.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolFile.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolHammer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolPickaxe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolSaw.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolScrewdriver.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolShovel.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolSword.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXItemToolWrench.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXToolGen.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/item/tools/GTCXToolMaterial.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/GTCXJeiPlugin.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/category/GTCXJeiBurnableFluidCategory.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/category/GTCXJeiCauldronCategory.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/category/GTCXJeiCustomCategory.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/category/GTCXJeiIntegratedCircuitCategory.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/wrapper/GTCXJeiBurnableFluidWrapper.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/wrapper/GTCXJeiCasterWrapper.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/wrapper/GTCXJeiFusionWrapper.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/wrapper/GTCXJeiHeatWrapper.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/jei/wrapper/GTCXJeiIntegratedCircuitWrapper.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXBaseCoverLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXConveyorModuleLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXDrainModuleLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXFluidFilterLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXItemValveModuleLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXNullLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXPumpModuleLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXRedstoneControllerLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/logic/GTCXShutterLogic.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/material/GTCXMaterial.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/material/GTCXMaterialDict.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/material/GTCXMaterialGen.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/material/GTCXMaterialItemHot.java (100%) create mode 100644 src/main/java/gtc_expansion/mixin/LateMixin.java rename src/main/java/{vgt_expansion => gtc_expansion}/model/GTCXModelCasing.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/model/GTCXModelHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/model/GTCXModelPipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/model/GTCXModelPipeFullBlock.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/model/GTModelLayeredAnchoredWire.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/oneprobe/GTCXOneProbePlugin.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/oneprobe/GTCXProbeHandler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/oneprobe/GTCXProbeModule.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/proxy/GTCXClientProxy.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/proxy/GTCXCommonProxy.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/recipes/GTCXRecipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/recipes/GTCXRecipeIterators.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/recipes/GTCXRecipeLists.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/recipes/GTCXRecipeMods.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/recipes/GTCXRecipeProcessing.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/recipes/GTCXRecipeRemove.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/render/GTCXGuiFirstLoad.java (96%) rename src/main/java/{vgt_expansion => gtc_expansion}/render/GTCXOverlay.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/render/GTCXRenderer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/render/Matrix4.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/render/Transformation.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileAdvancedWorktable.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileAlloyFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileAlloySmelter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileAssemblingMachine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileBath.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileBrick.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileCasing.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileCentrifuge.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileChemicalReactor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileDieselGenerator.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileDigitalTank.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileDustbin.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileElectricLocker.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileElectrolyzer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileExtruder.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileFluidCaster.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileFluidSmelter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileGasTurbine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileLathe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileLocker.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileMicrowave.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTilePlateBender.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTilePlateCutter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileStoneCompressor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileStoneExtractor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileTrashBin.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/GTCXTileWiremill.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/base/GTCXTileBaseBurnableFluidGenerator.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/base/GTCXTileBaseSteamMachine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/base/GTCXTileMultiBaseMachineAdv.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/hatch/GTCXTileEnergyOutputHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/hatch/GTCXTileFusionEnergyInjector.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/hatch/GTCXTileItemFluidHatches.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/hatch/GTCXTileMachineControlHatch.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiCokeOven.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiDistillationTower.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiFusionReactor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiImplosionCompressor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiIndustrialBlastFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiIndustrialGrinder.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiIndustrialSawmill.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiLargeGasTurbine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiLargeSteamTurbine.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiPrimitiveBlastFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiThermalBoiler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/multi/GTCXTileMultiVacuumFreezer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/overrides/GTCXTileScanner.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/pipes/GTCXTileBaseFluidPipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/pipes/GTCXTileBaseItemPipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/pipes/GTCXTileBasePipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/pipes/GTCXTileQuadFluidPipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/steam/GTCXTileCoalBoiler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/steam/GTCXTileSteamAlloySmelter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/steam/GTCXTileSteamCompressor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/steam/GTCXTileSteamExtractor.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/steam/GTCXTileSteamForgeHammer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/steam/GTCXTileSteamFurnace.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/steam/GTCXTileSteamMacerator.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/wiring/GTCXTileAluminiumCable.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/wiring/GTCXTileColoredCable.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/tile/wiring/GTCXTileElectrumCable.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/CoverStorage.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/EnergyConsumer.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXBatteryInput.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXBedrockOreHandler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXBetterPipesCompat.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXCropHandler.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXDustbinFilter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXHelperPipe.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXIc2cECompat.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXMaterialWrench.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXPassiveMachineFilter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXRecipeInputIngredient.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXScannerFilter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXSteamMachineFilter.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXTank.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/GTCXWrenchUtils.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/MultiBlockHelper.java (100%) rename src/main/java/{vgt_expansion => gtc_expansion}/util/RotationHelper.java (100%) create mode 100644 src/main/resources/icon.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c7c55d3..af84f0b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,415 +1,12 @@ # Changelog -#0.2.1.2 - - fixed ct recipe expansions not working - - decreased stack size of efficiency upgrades from 16 to 4 - - added endstone macerating recipe - - added support for overclocker and other such modifying upgrades to multiblocks - - fixed overridden items not showing up in jei - - added ct methods for forge hammer - -# 0.2.1.1 - - fixed crash - -# 0.2.1 - - Moved tile texture into just a single large sprite sheet, should hopefully reduce ram usage a little - - made recipes using ic2 pump also use bc pump if bc is loaded - - renamed wrench interface, renamed method in scrwdriver interface. this means that gravisuit classic 1.0.8.3 will not load with this, you will need 1.0.8.4 - - made fluid caster have a new animated texture - - changed wrench recipes to use plates and a hammer, they wil observe the plate and crafting tool config options - - added iron bar recipe to assembling machine - - fixed large turbines not outputting fluid - - added stone dust to rare earth extractor - - made fluid smelter active when powered with redstone - - made my single use batteries able to be used in discharging slots - - fixed my single use battery recipes give the full batteries - - added some of my canning machine recipes to ic2c extras fluid canning machine - - added burnable tooltips for diesel gen and gas turbine - - added biomass distilling recipe - - fixed bath dupe bug - - changed required circuit mode for nichrome from 0 to 2 - - filtered digital tank input slot - - added hopper assembling recipe - - added new one probe info that tells you that wrenches are needed for machines - - temp fix to allow wood into the coke oven - - fixed auto output of hatches - - fixed invar pipes not saving their material to world nbt on unload, causing them to become bronze fluid pipes - - made electric screwdriver able to rotate blocks - - fixed fusion reactor not saying the structure is valid when it is valid - - fixed the fusion reactor continously increasing the max eu when a fusion energy injecor is removed and placed back down(hopefully) - - hopefully fixed a rare crash I found when picking up a fusion energy injector - - fixed second fusion material injector and fusion material extractor tank display slot being switched with each other, such that the output displays the second input and visa versa - - fixed fusion reactor and large gas turbine not saving contents of tanks - - added saw - currently just used to make vanilla amounts of planks and sticks, will add mod compat later - - added steam machines - - added gt2 config option - - fixed fusion reactor jei info - - fixed fusion reactor slot item setting - - made energy output hatches able to output less then the specified output - - fixed microwave explode issue - - added crafting table recipe for drain cover - - made alloy smelter have varying eu usage - - added plate cable config - - added crushed ore cauldron washing - - fixed pump cover not pulling fluids from ic2c multitanks into quad pipes properly - - fixed opening guis of blocks when trying to place cover on pipe - -# 0.2 - - Greatly reduced the ram requirements of gtcx, there still might be more improvements to do yet. - - Improved server performance of a couple tiles - - Added wood plate - - Overrode centrifuge, you have to pick up existing ones and put it in the crafting grid to get the new one - - Added certus quartz recipe to industrial grinder - - Added new electric rail recipes for rc compat - - Added bath - - Added branch cutters - only available when forestry is loaded, basically version of the grafter but with a lot more durability - - Added integrated circuit jei support - - Added pure glass block - - Added fluid pipes - may be unforseen bugs yet, but so far not many bugs. They are a bit like gt6 fluid pipes - - Added covers - - Added digital tank - - Added screwdriver - - Added new config for forcing pre electric machines, currently it just removes the sticky resin smelting recipe - - Added coke oven, coal coke, and creosote - - Added crushed ore config - - Added small aluminium dust to dustSmallAluminum oredict - - Added multiblock tooltips to fusion controller - - Possibly fixed diesel gen generation issues - - Reverted end game stuff like personal force field requiring osmium - - Refactored hatch multiblocks, the haches now get the fluids and items from the multiblocks themselves, they are not just accessors and setters - - Hatches now only get a casing texture if there are either 4 of the same casing adjacent or 3 of the same casing and one hatch adjacent - will make future casing support much easier - - Made my wrenches no longer take massive amounts of damage when preventing loss - - Changed regular reactor plating recipe to use lead plate instead of dense copper plate - - Ruby grinder water recipe now makes 2 small chrome dust instead of 1 - - Diamond grinding recipe now makes 6 instead of 8 small diamond dusts as byproduct - - Olivine now outputs pyrope instead of emerald as the secondary output, and emerald now does aluminium instead of olivine - - Added diamond, olivine, and emerald acid recipes to grinder that give 3 - - Added nether quartz grinder recipe that outputs 4 nether quartz and 2 small netherrack dust - - Nerfed all ore extracting recipes to 2 from 3 - - Fixed crop textures - - Refactored a bunch of ct stuff - - Changed tetrahedrite ore texture - - Extruder no longer requires the mold in the mold slot - - Updated chromite ore texture, it's now a bit lighter - - Doubled default chromite weight - recommend you regenerate your config - - Disabled precision wrench recipe if ic2c extras is loaded with the wrench override config true - - Made my wrench always enabled even with the crafting tools disabled, it's just not used in recipes when said config is disabled - - Removed macerator recipe that uses the grinder heads - - Changed rotary macerator recipe to use stainless steel plates instead of grinder heads in the corners - - Crushed ore processing is no longer dependent on ic2c extras - - Fusion reactor now shows gain instead of total output, doesn't account for start eu though - - Added a little more debug info for dynamo hatch - - Fixed wrench duplication - - Fixed wood recipes - - Added railcraft electrode and coil recipes - - Fixed sawmill lubricant issue - - Removed a logger - - Marble now macerates to marble dust - - Fixed reactor chamber override with ic2c extras - - Removed tiles from casings, means that the rotor textures will be broken for now till I figure out how to do it properly without using a tile - - Nerfed glass fibre cables recipe - - Removed silicon fluid - - Converted all berylium fluid outputting recipes to outputting the item - - Added assembling machine recipe for iron fence - - Fixed electric sprayer recipe only taking full cf sprayer and made the recipe transfer foam from cf sprayer - - Made iron scaffold recipe always use iron and made it use rods instead of fences - - Made hardening spray work with turning foamed iron scaffold to reinforced stone - - Made it possible to put hardening spray and matchbox in tool box - - Made my wrenches have a faster mining speed - - Thick reflector now takes beryllium plates instead of ingots - - Changed casing to iron fence recipe in wiremill to always do iron - - Made output hatch and dynamo hatch change modes with screwdriver - - thermal boiler now has to have 2 output hatches - - Fixed dynamo hatch mode info not being localized and running twice - - Added iridium dust to ic2 iridium ore item compressing recipes - - Made circuit crafting recipe take insulated cable - assembling recipe still uses uninsulated version - - Reduced air electrolyzing power usage by a factor of ten - - Made pbf able to output and input any items from the brick - - Made ic2 crop scanner accept forestry bees, saplings, ect. - - Boosted eu production from some fluids in the diesel gen, moved fuel and forestry ethanol from liquid fuel gen to diesel gen - - Made digital tanks merge same fluid from a fluid orb into it's tank, even leaving any remaining fluid it can't accept in the orb - - Added extra emerald ore gen to extreme hills - - Made wrench able to harvest hoppers and furnaces - - Removed unnecessary blockstate properties from pipes and cables, may improve ram usage a little more - - Changed all air checks in multiblock checks to proper air checks instead of air state checks, should now work with other blocks that register as air - - Lightened dark blue elements of the fusion reactor gui a little - - Made dark blue text in fusion gui light blue instead - - Added buttons to fusion reactor gui that show the layers of the fusion structure - - Added new greeting panel when you first load the game, came about because of some drama between me and e the author of gtc - - -# 0.1.2 - - Added thermal boiler - - Added input, output, machine control, and dynamo hatches - - Adeed lava filter, turbine rotors, turbine blades, and broken turbine rotors - - Added large steam turbine - - Added large gas turbine - - Added plate cutting machine - - Added fusion reactor - - Added extruder - - Added diamond sawblade - - Added hardening spray - - Added industrial sawmill - by default it overrides the ic2c sawmill, but that can be changed in the config if so desired - - Added trash bin - - Added stone compressor and stone extractor - - Fuxed greg icon in alloy furnace gui not being a simple yellow - - Added diamond to diamond dust recipe to macerator - - Added nugget to ingot recipes - - Added tungstensteel reinforced stone - - Added connected textures for casings - - Made electrolyzer output fluids instead of fluid tubes, will be pr’d into the centrifuge soon. - - Fixed itnt recipe in assembling machine - - Fixed possible lang crash - - Fluid smelter and caster now auto output and input fluids in the right and left sides respectively - - Rebalanced damage done by gtcx tools - - Made tungstensteel tools use steel rods and steel tools use iron rods - - Assembling machine no longer accepts aluminium instead of steel in its crafting recipe - - Magic energy converter now uses plates - - Added tungstensteel dust to hot tungstensteel ingot recipe to ibf - - Fixed magnalium recipe only making 1 instead of 3 - - Added 3 tetrahedrite 1 zinc to 3 brass and 3 tetrahedrite 1 tin to 3 bronze recipes to alloy smelter - - Made cinnabar electrolyzing recipes take a bit longer - - Did same with redrock dust, endstone dyst, and tetrahedrite dust - - Added various centrifuging and electrolyzing recipes for alloy dusts - - added fertilizer recipe to chemical reactor - - Added config option to make my tools not have the enchantment tool glean, client side only - - Made integrated circuit get it’s mode based off the metadata - - Fixed iron bars recipe and put the wrench on the top instead of bottom for the recipe - - Made hull recycling recipes only output 6 ingots instead of 8 cause of an exploit found - - Fixed refined iron + ash to iron recipe - - Fixed chromite not generating - - Removed extra pesu recipe - - Changed heat values for materials in the fluid smelter to match gt6 - - Added torch placement to ic2 drills - - Fixed windmill recipes using aluminium instead of magnalium - - Made machine block permanently a cheap machine block, steel hull is now used instead in basic machine block recipes - - Made sheldonite processing output tiny iridium dust instead of iridium nuggets - - Added ic2c extras iridium shard to iridium tiny dust recipe in macerator - - Made electrum circuit board recipe not use silver - - Multiblocks now only support certain types of ic2 upgrades: ImportExport, RedstoneControl, and Sounds - - Changed recipes of some reactor heat vents and such, and cells - - Added some tooltips for blocks - - Added fluid support to chemical reactor - - Fixed fluid smelter not working with upgrades - - Added refined iron plate, rod, and gear to wrought iron oredict - - Added aluminium and electrum cables - - Added saphire acid i. grinder recipe - - Added invar as a viable alternative to steel/refined iron in mixed metal ingot recipe - - Fixed nichrome conflict with stainless steel - - Added coil recycling recipes - - Removed stainless steel hull from the advanced machine block oredict - - Added wood nerf config, defaults to false - - Changed reinforced casing recipe to use basic machine blocks instead of advanced - - Fixed a rare crash - - Made sodalite not usable in circuit recipes - - Added alternative hv cable using recipes that use aluminium cables instead - - Added thermal glowstone and ender clathrate recipe to vacuum freezer - - Added proper marble and redrock support - - Fixed colors of my color blocks not getting set on the server side - - Added crowbar - only useful as railcraft crowbar right now, but will be used to remove covers from pipes once those are finished - - Ic2c extras thermal centrifuge now uses steel plates instead of refined iron/steel ingots based off ic2c steel config - - A couple other machines also now only use steel even when the steel mode is off - - Added osmiridium material - - Made cloaking device and forcefield require osmium, and made tesla staff require osmiridium - - Added "OsmiumGT" oredict to all osmium items to prevent usage of mekanism osmium in gtcx recipes - - Added 9 iridium dust to 1 osmium dust centrifuging recipe - - Added ae2 compat - pure crystals can now be made in indusrial electrolyzer, and charged certus can now be made in ic2c electrolyzer - - Moved thorium to regular furnace from ibf - - Fixed sodium sulfide using carbon instead of sulfur - - Iron fence now uses iron rods instead of refined iron rods, excep in the instance that crafting tools are disabled - - Made wave generator and ocean generator more expensive - wave generator now require magnalium turbine rotors, ocean generator require osmium rotors - - Thermometer now requires mercury - - Nuclear rods now use regular copper plates instead of dense copper plates in dual and quad recipes - - Fixed chemical reactor texture having slot textures where slots don't exist - - Added match and match box - - Added ability to make thermal fluids by smelting certain items in the fluid smelter - - Fixed the no power icon overlaying over the slots in the chemical reactor, it now overlays at the bottom - - Made distillation tower use the multitank that the machine tank uses, you won't lose your fluids, it'll just add any new fluids to the new tank. next release after this curse one those old tanks will be gone, so take out your fluids now. - - Added fluid filters to all input tanks of machines that didn't have ones, fixed i sawmill only accepting water in the process - - Made soul sand in centrifuge give saltpeter - -# 0.1.1 -- Added intergrated circuit -- Added more rc recipes -- Added railcraft and gravisuit compat config options -- Fixed distillation tower consuming fluids and processing even when it shouldn't -- Added fluid support to electolyzer -- Added recipes to plate ender and wiremill from ic2c extras roller and extruder -- Made steel jackhammer able to mine obsidian again -- Possibly fixed diamond chainsaw not activating fast leaf decay's fast leaf decaying -- Increased attack of diamond chainsaw from 10 to 15 - -# 0.1.0 -- Fixed a few recipes - see commit history for more details of what was changed -- Added better mod support for other stones to steel jackhammer. -- Added cassiterite material -- Made Dustbin autocompress stacks -- Added some missing recipes - -# 0.0.9 -- Changed fluid caster gui recipe use info -- New fluid smelter and caster textures thanks to Globalista Maoísta, also changed chainsaw texture thanks to same person -- added recipes for super fuel binders -- added support for railcraft, not finished yet. -- made distillation tower only accept valid fluids -- fixed base heat getting reset on chunk, world, or server reload -- added recipe for saltpeter -- fixed unsmeltable ic2 dusts in fluid smelter -- made fluid smelter heat go up with redstone signal -- removed recipes for data stuff as e removed the data items -- new forcefield projector and tesseract recipes - -# 0.0.8 -- Added tooltips for lockers and advanced worktable -- Added dustbin -- Increased required temperature of nichrome and kanthal -- Added hardened clay processing to i. grinder -- Changed ruby processing -- Changed rotary macerator recipe -- Added chromite ore, spawns at same rate as sheldonite. -- Fixed blast furnace heat getting reset when any slot gets changed - -# 0.0.7 -- Added fluid caster and molds -- Added fluid smelter -- Note: the fluid caster and fluid smelter currently have the alloy smelter texture, I'll fix that eventually. -- Added plate bender -- Added wiremill -- Added lathe -- Added microwave oven -- Fixed alloy smelter needing too much eu/tick -- Replaced the g in guis with a flat yellow g instead of a gradient yellow g -- Made aluminium and silicon require blast furnace to smelt, however the heat value is the same as steel. -- Added config to remove all furnace recipes for charcoal, defaults to false. -- Changed iron fence recipe -- Changed iron bar and hopper recipes -- Made oilberries a food, though I would not recommend eating them. the results would be... unpleasant. -- Fixed some of my new tiles not displaying their max eu input. -- Made my electric items have a cyan durability bar. -- Added config for recipes using crafting tools. -- Added config for harder circuit recipes. -- Removed the harder progression config in favor of more modular individual configs. -- Added iridium reinforced tungstensteel block -- Reduced redstone amount from 10 to 8 in the macerator -- Blacklisted iridium alloy ingot oredict in auto plate recipes -- Removed duplicate obsidian to silicon recipe in centrifuge -- Made small dust to dust recipe shapeless -- Added ingotHot oredicts to the hot ingots -- Fixed some ic2 dusts to gtc small dust recipes -- Added better uranium and sideproducts out of uranium ore using mercury and sodium persulfate- may change bit -- Fixed position of invalid multiblock overlay of industrial grinder -- Added oreTungsten oredict to tuungstate ore -- Added my own bedrock ores to gtc's new bedrock ore list -- Fixed jei border on the ibf cutting off at the bottom. -- Fixed data storage circuit recipe not using proper amount of emeralds or olivine -- Added diesel generator -- Added gas turbine -- Added coil slot to industrial blast furnace -- Changed plutonium byproduct from grinding uranium ore to thorium -- Added biofuel and coalfuel fluids so they can be burned in the diesel gen. the cells empty into the fluid when placed into the diesel gen. -- Added pump module -- Added 2 more tanks to the distillation tower and added lube as an output of oil and fuel as an output of naptha -- Added nickel ore processing to the industrial grinder -- Added thermal hardened glass recipes to the alloy smelter -- Fixed steel jack hammer being able to mine obsidian and other diamond level blocks -- Lowered steel jackhammer speed to 7x as fast as the diamond one is at 3x3 -- Fixed ruby ore dropping red garnets when silk touched -- Added ct support for all machines added in this update except for the microwave. -- Changed recipe of vacuum freezer controller and advanced machine casingsLowered default gen of galena- needs a config reset to take effect. -- Added advanced worktable- advanced version of the basic worktable, can charge items in the worktable's new tool slots. advanced worktable can accept tier 2 power. -- Added regular and charging lockers- right click to swap your armor. charging can charge up to tier 3 items and can accept tier 3 power. The locker's gui can be opened if in creative and not right clicking the front. -- Quartered itnt amounts needed for compressing gem dusts in the implosion compressor -- Moved coal chunk to industrial diamond recipe to the implosion compressor -- Added explosion sound to compressor; occurs every 2 seconds while processing. -- Fixed some centrifuge recipes being unintentionally removed. -- Added radiation to plutonium and uranium- ads to the ic2c extras list instead of gtcx's system when ic2c extras is loaded. -- Added ct support for the radiation system, does nothing if ic2c extras is loaded. - -# 0.0.6 - - made pbf display particles when active - - fixed eu display amount in pbf recipes in jei - - removed dust alloy recipes and moved nichrome alloy recipe to blast furnace - - tweaked material textures - - added galena recipe to pbf - - added dark ash as a second output of steel recipes in pbf - - changed a couple material colors - - removed generator recipe that uses an iron furnace - - changed end sheldonite texture - - changed alloy furnace to brick instead of stone based - - made it possible to get carbon out of regular ash - - fixed centrifuge not being able to accept aluminum in place of steel - - made my wrenches 100% lossless since I override ic2c bronze one anyways. haven't decided whether I want to override the electric one yet. - - made industrial grinder multiblock controller go on the side center like in gt4 instead of the bottom center - - tweaked tile guis and added 2 more upgrade slots to he assembling machine and alloy smelter - - made mobs unable to spawn on fire bricks - - removed a couple loggers I accidently left in - - added steel jack hammer and diamond chainsaw. - - added gravisuit classic compat such that the advanced chainsaw and drill recipes are changed - -# 0.0.5.1 - - - fixed tinker's crash - - fixed some recipe not overriding ic2 or gtclassic recipes when ic2 classic's steel config is enabled - -# 0.0.5 - - - fixed primitive blast furnace and allow furnace not dropping with pickaxe - - refactored material registeration. **MEANS ALL YOUR MATERIALS THAT ARE NOT INGOTS OR DUSTS OR BLOCKS OR GEMS WILL BE DELETED. SO TURN EVERYTHING BACK INTO ONE OF THOSE 4.** - - made recipes using aluminium plates use both aluminiums - - added assembling machine recipes for furnace and crafting table - - fixed circuit recipes not overriding ic2 ones when steel mode is enabled. -# 0.0.4 - - - Fixed overlapping slots in a couple machines. - - Added missing energy buffers to implosion compressor, industrial grinder, and vacuum freezer. may fix compatibility with mekanism energy pipes. - - Fixed molten fluid textures sometimes not working. - - Added ct support for all current machines. haven't made any docs yet though. - - Fixed structures of vacuum freezer and distillation tower. - - Fixed lang tooltips of both blast furnaces. - - Made industrial grinder now use straight fluids instead of fluid containers. - - Added click fluid support for industrial grinder and distillation tower. - - Refactored config system in the background, may need to regenerate the config. - - Made flint tools no longer have an enchantment glow. - - Fixed axe attack speeds and damages - -# 0.0.3 - - - Ported over blast furnace from gtclasic, but with the addition of heat requirements for recipes. different casings give different amounts of heat, and using lava in the center instead of air will increase the heat 250 per lava source block, so up to 500. - - Added Wrenches and removed gem crafting tools - - Added assembling machine - - Added chemical reactor - - Added distillation tower - - ported over ic2c extras roller ingot blacklist additions from ic2c extras to this. - - Added gt2 mode config, not implemented for machine recipes yet. - - Added gear recipes - - Changed some gtc and ic2c recipes. - - Added some fluids, such as diesel and gasoline - - Added oilberry crop - - Added acid, mercury, lithium(large only), and sodium standard and large batteries - - Added a few of my materials to the element list. - - Added config to remove crafting uu recipes in order to force the uu assembler. - - Removed green sapphire and made the industrial grinder recipe for sapphire ore output small aluminium in it's place. - -# 0.0.2.2 (Not released on curse) - - - Added back nickel, olivine, and zinc crops - - Removed the iridiumAlloyIngot oredict from iridium alloy ingots so mods don't try to add recipes for ingot to plate in their respective plate making machines. - - Changed circuit recipes to use uninsulated copper cables, red alloy plates on the side, and refined iron or other plates in the center. - - Added ic2c extras compat for dense plate recipes. - - Made tiles display their max input. - - Fixed tool dupes with hammer and file. - - Made hot ingots burn you if you don't have fire resistence effect, full hazmat suit, or full quantum suit. - -# 0.0.2.1 (Not released on curse) - - - Removed crops for now till gtclassic 1.0.4 is released. - - Added olivine, galena, tetrahedrite, and cassiterite to twilight hollow hill worldgen. - - Fixed some gtclassic and ic2 recipes that I override, though the effect may not be seen till gtclassic 1.0.4 comes out - -# 0.0.2 (Not released on curse) - - - Added Cassiterite, Tetrahedrite, and Galena ores. - - Added crushed ores, purified crushed ore, and tiny dusts that are only available when ic2c extras is loaded. - - Added nickel, olivine, and zinc crops - - Modified the total damage values of flint, ruby, and sapphire tools to be 2x, 4x, and 4x respectively. - - Made platinum smeltable in the furnace and removed it's blast furnace recipe. +## v0.3.0 +### Changes +- first release under Ender Development +- switched to RetroFuturaGradle +- updated dependencies +- switched from GregTech Classic to Vintage GregTech +- made sure compatibility is given with all IC2C related mods +- updated to the newest version of IC2C for 1.12.2 +- polished the README.md +- updated `mcmod.info` \ No newline at end of file diff --git a/build.gradle b/build.gradle old mode 100755 new mode 100644 index ea5583a8..c2cf48d0 --- a/build.gradle +++ b/build.gradle @@ -1,145 +1,215 @@ -buildscript { - repositories { - jcenter() - maven { url = "http://files.minecraftforge.net/maven" } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - } +import org.jetbrains.gradle.ext.Gradle + +plugins { + id 'java' + id 'java-library' + id 'maven-publish' + id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7' + id 'eclipse' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.30' + id 'com.matthewprenger.cursegradle' version '1.4.0' } -apply plugin: 'net.minecraftforge.gradle.forge' -//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +version = project.mod_version +group = project.maven_group +archivesBaseName = project.archives_base_name -version = "${mod_version}" -group = "gtc_expansion" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "GTCExpansion" +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + // Azul covers the most platforms for Java 8 toolchains, crucially including MacOS arm64 + vendor.set(org.gradle.jvm.toolchain.JvmVendorSpec.AZUL) + } + // Generate sources and javadocs jars when building and publishing + withSourcesJar() + // withJavadocJar() +} -sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. -compileJava { - sourceCompatibility = targetCompatibility = '1.8' +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' } -minecraft { - version = "${mc_version}-${forge_version}" - runDir = "run" - - // the mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD snapshot are built nightly. - // stable_# stables are built at the discretion of the MCP team. - // Use non-default mappings at your own risk. they may not always work. - // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "${mappings_version}" - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. - - replace "@VERSION@", project.version - replaceIn "GTCExpansion.java" +configurations { + embed + implementation.extendsFrom(embed) } -repositories{ - maven { // JEI - name 'DVS1 Maven FS' - url 'http://dvs1.progwml6.com/files/maven/' - } - maven { // The One Probe - name 'tterrag' - url 'http://maven.tterrag.com/' +jar { + manifest { + def attribute_map = [:] + if (project.use_coremod.toBoolean()) { + attribute_map['FMLCorePlugin'] = project.coremod_plugin_class_name + if (project.include_mod.toBoolean()) { + attribute_map['FMLCorePluginContainsFMLMod'] = true + attribute_map['ForceLoadAsMod'] = project.gradle.startParameter.taskNames[0] == "build" + } + } + if (project.use_access_transformer.toBoolean()) { + attribute_map['FMLAT'] = 'embers_at.cfg' + } + attributes(attribute_map) + } + // Add all embedded dependencies into the jar + from(provider { configurations.embed.collect { it.isDirectory() ? it : zipTree(it) } }) +} + +minecraft { + mcVersion = project.mc_version + // MCP Mappings + mcpMappingChannel = 'snapshot' + mcpMappingVersion = '20171003' + + // Set username here, the UUID will be looked up automatically + username = '_MasterEnderman_' + + // Add any additional tweaker classes here + // extraTweakClasses.add('org.spongepowered.asm.launch.MixinTweaker') + + // Add various JVM arguments here for runtime + def args = ["-ea:${project.group}"] + if (project.use_coremod.toBoolean()) { + args << '-Dfml.coreMods.load=' + coremod_plugin_class_name } - maven { // Tesla - name 'MMD' - url 'https://maven.mcmoddev.com/' + if (project.use_mixins.toBoolean()) { + args << '-Dmixin.hotSwap=true' + args << '-Dmixin.checks.interfaces=true' + args << '-Dmixin.debug.export=true' } + extraRunJvmArguments.addAll(args) + + // Include and use dependencies' Access Transformer files + useDependencyAccessTransformers = true + + // Add any properties you want to swap out for a dynamic value at build time here + // Any properties here will be added to a class at build time, the name can be configured below + // Example: + injectedTags.put('VERSION', project.version) + // injectedTags.put('MOD_ID', project.archives_base_name) +} + +repositories { + maven { url "https://repo.spongepowered.org/maven" } + maven { url "https://repo.cleanroommc.com/releases" } + maven { url "https://dvs1.progwml6.com/files/maven" } + maven { url "https://maven.blamejared.com/" } + maven { url "https://www.ryanliptak.com/maven/" } + maven { url "https://maven.thiakil.com/" } maven { - name = "jared" - url = "https://maven.blamejared.com" - } - maven { // CCL, CCC, NEI - name 'Chickenbones Repo' - url 'http://chickenbones.net/maven/' - } - maven { // CoFH - name 'Covers Maven' - url 'http://maven.covers1624.net/' + name 'GTNH Maven' + url 'https://nexus.gtnewhorizons.com/repository/public/' } maven { - name = "buildcraft" - url = "http://www.mod-buildcraft.com/maven/" + name 'GTCEu Maven' + url 'https://maven.gtceu.com' } maven { - name = "ic2" - url = "http://maven.ic2.player.to/" + name 'CurseMaven' + url 'https://cursemaven.com' + content { + includeGroup 'curse.maven' + } } - maven { - url = "https://www.cursemaven.com" - }/* - maven { //Backup - url "https://modmaven.k-4u.nl" - }*/ + mavenLocal() // Must be last for caching to work } dependencies { - implementation 'org.jetbrains:annotations:19.0.0' - deobfProvided "mezz.jei:jei_${mc_version}:${jei_version}:api" - runtime "mezz.jei:jei_${mc_version}:${jei_version}" - compile "curse.maven:ic2c-extras-302906:3087233" - deobfCompile("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.22-13") { transitive = false } - //runtime "curse.maven:ic2c-extras:3033496" - deobfProvided("net.sengir.forestry:forestry_${mc_version}:${forestry_version}") { + // Common: + annotationProcessor 'org.ow2.asm:asm-debug-all:5.2' + annotationProcessor 'com.google.guava:guava:32.1.2-jre' + annotationProcessor 'com.google.code.gson:gson:2.8.9' + + // RetroFuturaGradle: + String mixinBooter = modUtils.enableMixins('zone.rong:mixinbooter:9.1') + // modUtils.enableMixins('zone.rong:mixinbooter:9.1', 'mod_id.mixins.refmap.json') << add refmap name as 2nd arg (optional) + api(mixinBooter) { transitive = false } - runtime("net.sengir.forestry:forestry_${mc_version}:${forestry_version}") { + annotationProcessor(mixinBooter) { transitive = false } - compile "curse.maven:baubles-227083:2518667" - compile "curse.maven:ic2_classic-242942:3093608" - compile "curse.maven:gtclassic-324021:3059975" - compileOnly "curse.maven:railcraft-51195:2687757" - compileOnly "curse.maven:better_pipes-402834:3050661" - compileOnly "curse.maven:twilight_forest-227639:3051450" - runtime "curse.maven:railcraft-51195:2687757" - runtime "curse.maven:better_pipes-402834:3050661" - deobfProvided ("cofh:CoFHCore:${mc_version}-${cofhcore_version}:universal") { - exclude group: 'mezz.jei' +} + +if (getFile('dependencies.gradle').exists()) { + apply from: 'dependencies.gradle' +} + +// Adds Access Transformer files to tasks +if (project.use_access_transformer.toBoolean()) { + for (File at : sourceSets.getByName("main").resources.files) { + if (at.name.toLowerCase().endsWith("_at.cfg")) { + tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(at) + tasks.srgifyBinpatchedJar.accessTransformerFiles.from(at) + } } - deobfCompile(group: 'CraftTweaker2', name: 'ZenScript', version: craft_tweaker_version) { - exclude group: 'org.ow2.asm' - exclude group: 'com.google.code.gson' +} + +processResources { + // This will ensure that this task is redone when the versions change + inputs.property 'version', project.version + inputs.property 'mcversion', project.minecraft.version + + // Replace various properties in mcmod.info and pack.mcmeta if applicable + filesMatching(['mcmod.info', 'pack.mcmeta']) { fcd -> + // Replace version and mcversion + fcd.expand( + 'version': project.version, + 'mcversion': project.minecraft.version + ) } - deobfCompile(group: 'CraftTweaker2', name: 'CraftTweaker2-API', version: craft_tweaker_version) { - exclude group: 'org.ow2.asm' - exclude group: 'com.google.code.gson' + + if (project.use_access_transformer.toBoolean()) { + rename '(.+_at.cfg)', 'META-INF/$1' // Make sure Access Transformer files are in META-INF folder } - deobfCompile(group: 'CraftTweaker2', name: 'CraftTweaker2-MC1120-Main', version: "1.12-${craft_tweaker_version}") { - exclude group: 'org.ow2.asm' - exclude group: 'com.google.code.gson' +} + +idea { + module { + inheritOutputDirs = true + downloadSources = true + } + project { + settings { + runConfigurations { + "1. Run Client"(Gradle) { + taskNames = ["runClient"] + } + "2. Run Server"(Gradle) { + taskNames = ["runServer"] + } + "3. Run Obfuscated Client"(Gradle) { + taskNames = ["runObfClient"] + } + "4. Run Obfuscated Server"(Gradle) { + taskNames = ["runObfServer"] + } + } + compiler.javac { + afterEvaluate { + javacAdditionalOptions = "-encoding utf8" + moduleJavacAdditionalOptions = [ + (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') + ] + } + } + } } } -task deobfJar(type: Jar) { - from sourceSets.main.output - classifier = 'deobf' +publishing { + publications { + maven(MavenPublication) { + artifactId archivesBaseName + from components.java + } + } } -artifacts { - archives deobfJar +tasks.named("processIdeaSettings").configure { + dependsOn("injectTags") } +// Helpers -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } - - // copy everything else except the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } -} +def getFile(String relativePath) { + return new File(projectDir, relativePath) +} \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle new file mode 100644 index 00000000..dda37da3 --- /dev/null +++ b/dependencies.gradle @@ -0,0 +1,65 @@ +dependencies { + implementation "org.jetbrains:annotations:24.0.0" + + // Dependencies + implementation "CraftTweaker2:CraftTweaker2-API:" + project.crafttweaker + implementation "CraftTweaker2:ZenScript:" + project.crafttweaker + implementation "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-" + project.crafttweaker + + implementation rfg.deobf("curse.maven:had-enough-items-557549:" + project.hei) + implementation rfg.deobf("curse.maven:the-one-probe-community-edition-885670:" + project.top) + implementation("com.cleanroommc:groovyscript:" + project.groovyscript) { transitive = false } + // so it doesn't installs JEI + + implementation "com.azanor.baubles:Baubles:1.12-" + project.baubles + implementation rfg.deobf("curse.maven:ic2_classic-242942:" + project.ic2c) + implementation rfg.deobf("curse.maven:vintage-gregtech-844311:" + project.vgt) + + // Compatibility + compileOnly rfg.deobf("curse.maven:ic2c-extras-302906:" + project.ic2c_ex) + + if (project.compat_internal.toBoolean()) { + runtimeOnly rfg.deobf("curse.maven:ic2c-extras-302906:" + project.ic2c_ex) + runtimeOnly rfg.deobf("curse.maven:advanced-solars-classic-314835:" + project.advanced_solars) + runtimeOnly rfg.deobf("curse.maven:gravisuit-classic-314829:" + project.gravisuit) + runtimeOnly rfg.deobf("curse.maven:ic2c-additions-304040:" + project.ic2c_ad) + runtimeOnly rfg.deobf("curse.maven:ic2c-crop-overrides-334346:" + project.ic2c_crop) + runtimeOnly rfg.deobf("curse.maven:ic2c-custom-soils-350486:" + project.ic2c_soil) + } + + forestry = "curse.maven:forestry-59751:" + project.forestry + railcraft = "curse.maven:railcraft-51195:" + project.railcraft + better_pipes = "curse.maven:better_pipes-402834:" + project.better_pipes + twilight_forest = "curse.maven:twilight_forest-227639:" + project.twilight_forest + redstone_flux = "curse.maven:redstone-flux-270789:" + project.redstone_flux + cofh_core = "curse.maven:cofh-core-69162:" + project.cofh_core + steve_carts = "curse.maven:steves-carts-reborn-253462:" + project.steve_carts + + compileOnly rfg.deobf(forestry) + compileOnly rfg.deobf(railcraft) + compileOnly rfg.deobf(better_pipes) + compileOnly rfg.deobf(twilight_forest) + compileOnly rfg.deobf(redstone_flux) + compileOnly rfg.deobf(cofh_core) + + if (project.compat_external.toBoolean()) { + runtimeOnly rfg.deobf(forestry) + runtimeOnly rfg.deobf(railcraft) + runtimeOnly rfg.deobf(better_pipes) + runtimeOnly rfg.deobf(twilight_forest) + runtimeOnly rfg.deobf(redstone_flux) + runtimeOnly rfg.deobf(cofh_core) + runtimeOnly rfg.deobf("curse.maven:reborncore-237903:" + project.reborncore) + runtimeOnly rfg.deobf(steve_carts) + runtimeOnly rfg.deobf("curse.maven:sc-ic2c-compat-409410:" + project.sc_ic2c_compat) + } + + // Runtime dependencies + runtimeOnly rfg.deobf("curse.maven:vintagefix-871198:" + project.vintagefix) + runtimeOnly rfg.deobf("curse.maven:startup-timer-782070:" + project.startuptimer) + + runtimeOnly "com.cleanroommc:configanytime:" + project.configanytime + runtimeOnly rfg.deobf("curse.maven:red-core-873867:" + project.redcore) + runtimeOnly rfg.deobf("curse.maven:alfheim-lighting-engine-910715:" + project.alfheim) + runtimeOnly rfg.deobf("curse.maven:valkyrie-874067:" + project.valkyrie) +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 94991fda..d5ed7ce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,57 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. -org.gradle.jvmargs=-Xmx2G -mod_version=0.2.1.2 +org.gradle.jvmargs=-Xmx4G + +# Boilerplate Options +use_mixins = true +use_coremod = false +use_assetmover = false + +# Access Transformer files should be in the root of `resources` folder and with the filename formatted as: `{archives_base_name}_at.cfg` +use_access_transformer = true + +# Coremod Arguments +include_mod = true +coremod_plugin_class_name = + +# Mod Information mc_version=1.12.2 -forge_version=14.23.5.2831 -mappings_version=snapshot_20171003 +mod_version=0.3.0 +maven_group = vgt_expansion +archives_base_name = vgt_expansion + +# Mod Compatibility +compat_internal=true +compat_external=true + +# Mod Versions +baubles=1.5.2 +configanytime=2.0 +crafttweaker=4.1.20.698 +groovyscript=0.8.0 -jei_version=4.15.+ -forestry_version=5.8.2.387 -craft_tweaker_version=4.1.19.+ -cofhcore_version=4.6.+ \ No newline at end of file +# Mod File IDs +advanced_solars=4050834 +alfheim=4949716 +better_pipes=3050661 +cofh_core=2920433 +forestry=2684780 +gravisuit=4051081 +hei=5154770 +ic2c=5167044 +ic2c_ad=2635483 +ic2c_crop=2821067 +ic2c_ex=4841092 +ic2c_soil=2822170 +railcraft=2687757 +reborncore=3330308 +redcore=4883852 +redstone_flux=2920436 +sc_ic2c_compat=3062647 +startuptimer=5001902 +steve_carts=2834651 +top=4942348 +twilight_forest=3051450 +valkyrie=4591076 +vgt=4466591 +vintagefix=5010926 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 28861d273a5d270fd8f65dd74570c17c9c507736..c1962a79e29d3e0ab67b14947c167a862655af9b 100644 GIT binary patch delta 53726 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 115e6ac0..37aef8d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..05124ae1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,25 @@ +pluginManagement { + repositories { + maven { + // RetroFuturaGradle + name 'GTNH Maven' + url 'https://nexus.gtnewhorizons.com/repository/public/' + mavenContent { + includeGroup 'com.gtnewhorizons' + includeGroup 'com.gtnewhorizons.retrofuturagradle' + } + } + gradlePluginPortal() + mavenCentral() + mavenLocal() + } +} + +plugins { + // Automatic toolchain provisioning + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' +} + +// Due to an IntelliJ bug, this has to be done +// rootProject.name = archives_base_name +rootProject.name = rootProject.projectDir.getName() \ No newline at end of file diff --git a/src/main/java/vgt_expansion/GTCExpansion.java b/src/main/java/gtc_expansion/GTCExpansion.java similarity index 92% rename from src/main/java/vgt_expansion/GTCExpansion.java rename to src/main/java/gtc_expansion/GTCExpansion.java index 01c12bf6..b5731cc0 100644 --- a/src/main/java/vgt_expansion/GTCExpansion.java +++ b/src/main/java/gtc_expansion/GTCExpansion.java @@ -32,9 +32,9 @@ public class GTCExpansion { public static final String MODID = "gtc_expansion"; - public static final String MODNAME = "GTC Expansion"; - public static final String MODVERSION = "@VERSION@"; - public static final String DEPENDS = "required-after:ic2;required-after:ic2-classic-spmod;required-after:gtclassic@[1.1.6,);after:twilightforest@[3.9.984,);after:ic2c_extras@[1.4.4.12,);after:gravisuit@[1.0.8.1,)"; + public static final String MODNAME = "VGT Expansion"; + public static final String MODVERSION = Tags.VERSION; + public static final String DEPENDS = "required-after:ic2;required-after:ic2-classic-spmod;required-after:gtclassic@[1.2,);after:twilightforest@[3.9.984,);after:ic2c_extras@[1.4.8.7,);after:gravisuit@[1.0.8.1,);after:advancedsolars@[1.0.8,)"; @SidedProxy(clientSide = MODID + ".proxy.GTCXClientProxy", serverSide = MODID + ".proxy.GTCXCommonProxy") public static GTCXCommonProxy proxy; @Mod.Instance diff --git a/src/main/java/vgt_expansion/GTCXConfiguration.java b/src/main/java/gtc_expansion/GTCXConfiguration.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXConfiguration.java rename to src/main/java/gtc_expansion/GTCXConfiguration.java diff --git a/src/main/java/vgt_expansion/GTCXCrops.java b/src/main/java/gtc_expansion/GTCXCrops.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXCrops.java rename to src/main/java/gtc_expansion/GTCXCrops.java diff --git a/src/main/java/vgt_expansion/GTCXFluids.java b/src/main/java/gtc_expansion/GTCXFluids.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXFluids.java rename to src/main/java/gtc_expansion/GTCXFluids.java diff --git a/src/main/java/vgt_expansion/GTCXIcons.java b/src/main/java/gtc_expansion/GTCXIcons.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXIcons.java rename to src/main/java/gtc_expansion/GTCXIcons.java diff --git a/src/main/java/vgt_expansion/GTCXJei.java b/src/main/java/gtc_expansion/GTCXJei.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXJei.java rename to src/main/java/gtc_expansion/GTCXJei.java diff --git a/src/main/java/vgt_expansion/GTCXMachineGui.java b/src/main/java/gtc_expansion/GTCXMachineGui.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXMachineGui.java rename to src/main/java/gtc_expansion/GTCXMachineGui.java diff --git a/src/main/java/vgt_expansion/GTCXOreDict.java b/src/main/java/gtc_expansion/GTCXOreDict.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXOreDict.java rename to src/main/java/gtc_expansion/GTCXOreDict.java diff --git a/src/main/java/vgt_expansion/GTCXPlugin.java b/src/main/java/gtc_expansion/GTCXPlugin.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXPlugin.java rename to src/main/java/gtc_expansion/GTCXPlugin.java diff --git a/src/main/java/vgt_expansion/GTCXWorldGen.java b/src/main/java/gtc_expansion/GTCXWorldGen.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXWorldGen.java rename to src/main/java/gtc_expansion/GTCXWorldGen.java diff --git a/src/main/java/vgt_expansion/GTCXWorldGenTwilightForest.java b/src/main/java/gtc_expansion/GTCXWorldGenTwilightForest.java similarity index 100% rename from src/main/java/vgt_expansion/GTCXWorldGenTwilightForest.java rename to src/main/java/gtc_expansion/GTCXWorldGenTwilightForest.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockCasing.java b/src/main/java/gtc_expansion/block/GTCXBlockCasing.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockCasing.java rename to src/main/java/gtc_expansion/block/GTCXBlockCasing.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockDummyCover.java b/src/main/java/gtc_expansion/block/GTCXBlockDummyCover.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockDummyCover.java rename to src/main/java/gtc_expansion/block/GTCXBlockDummyCover.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockHatch.java b/src/main/java/gtc_expansion/block/GTCXBlockHatch.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockHatch.java rename to src/main/java/gtc_expansion/block/GTCXBlockHatch.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockLVMachine.java b/src/main/java/gtc_expansion/block/GTCXBlockLVMachine.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockLVMachine.java rename to src/main/java/gtc_expansion/block/GTCXBlockLVMachine.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockMisc.java b/src/main/java/gtc_expansion/block/GTCXBlockMisc.java similarity index 96% rename from src/main/java/vgt_expansion/block/GTCXBlockMisc.java rename to src/main/java/gtc_expansion/block/GTCXBlockMisc.java index 428689bb..dd5ba65e 100644 --- a/src/main/java/vgt_expansion/block/GTCXBlockMisc.java +++ b/src/main/java/gtc_expansion/block/GTCXBlockMisc.java @@ -25,6 +25,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -39,7 +40,7 @@ public GTCXBlockMisc(String name, LocaleComp comp, String toolRequired, int id, this.name = name; this.id = id; setRegistryName(this.name); - setUnlocalizedName(comp); + setTranslationKey(comp); setCreativeTab(GTMod.creativeTabGT); setHardness(hardness); setResistance(resistence); @@ -125,7 +126,7 @@ public int getBlockBurnTime(Block block) { @Nullable @Override - public TileEntity createNewTileEntity(World worldIn, int meta) { + public TileEntity createNewTileEntity(@NotNull World worldIn, int meta) { return null; } } diff --git a/src/main/java/vgt_expansion/block/GTCXBlockOre.java b/src/main/java/gtc_expansion/block/GTCXBlockOre.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockOre.java rename to src/main/java/gtc_expansion/block/GTCXBlockOre.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockOreBedrock.java b/src/main/java/gtc_expansion/block/GTCXBlockOreBedrock.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockOreBedrock.java rename to src/main/java/gtc_expansion/block/GTCXBlockOreBedrock.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockPipe.java b/src/main/java/gtc_expansion/block/GTCXBlockPipe.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockPipe.java rename to src/main/java/gtc_expansion/block/GTCXBlockPipe.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockPipeFluid.java b/src/main/java/gtc_expansion/block/GTCXBlockPipeFluid.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockPipeFluid.java rename to src/main/java/gtc_expansion/block/GTCXBlockPipeFluid.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockPipeItem.java b/src/main/java/gtc_expansion/block/GTCXBlockPipeItem.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockPipeItem.java rename to src/main/java/gtc_expansion/block/GTCXBlockPipeItem.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockStorage.java b/src/main/java/gtc_expansion/block/GTCXBlockStorage.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockStorage.java rename to src/main/java/gtc_expansion/block/GTCXBlockStorage.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockTile.java b/src/main/java/gtc_expansion/block/GTCXBlockTile.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXBlockTile.java rename to src/main/java/gtc_expansion/block/GTCXBlockTile.java diff --git a/src/main/java/vgt_expansion/block/GTCXBlockWire.java b/src/main/java/gtc_expansion/block/GTCXBlockWire.java similarity index 99% rename from src/main/java/vgt_expansion/block/GTCXBlockWire.java rename to src/main/java/gtc_expansion/block/GTCXBlockWire.java index 8280cfc0..b3c751b8 100644 --- a/src/main/java/vgt_expansion/block/GTCXBlockWire.java +++ b/src/main/java/gtc_expansion/block/GTCXBlockWire.java @@ -64,7 +64,7 @@ public class GTCXBlockWire extends GTBlockBaseConnect implements IGTColorBlock, GTMaterial material; public GTCXBlockWire(String name, LocaleComp comp, GTMaterial material){ super(); - setUnlocalizedName(comp); + setTranslationKey(comp); setRegistryName(name); this.setHardness(0.2F); this.setSoundType(SoundType.CLOTH); diff --git a/src/main/java/vgt_expansion/block/GTCXCropBlock.java b/src/main/java/gtc_expansion/block/GTCXCropBlock.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXCropBlock.java rename to src/main/java/gtc_expansion/block/GTCXCropBlock.java diff --git a/src/main/java/vgt_expansion/block/GTCXCropOilberry.java b/src/main/java/gtc_expansion/block/GTCXCropOilberry.java similarity index 100% rename from src/main/java/vgt_expansion/block/GTCXCropOilberry.java rename to src/main/java/gtc_expansion/block/GTCXCropOilberry.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerAlloyFurnace.java b/src/main/java/gtc_expansion/container/GTCXContainerAlloyFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerAlloyFurnace.java rename to src/main/java/gtc_expansion/container/GTCXContainerAlloyFurnace.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerAlloySmelter.java b/src/main/java/gtc_expansion/container/GTCXContainerAlloySmelter.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerAlloySmelter.java rename to src/main/java/gtc_expansion/container/GTCXContainerAlloySmelter.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerAssemblingMachine.java b/src/main/java/gtc_expansion/container/GTCXContainerAssemblingMachine.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerAssemblingMachine.java rename to src/main/java/gtc_expansion/container/GTCXContainerAssemblingMachine.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerBath.java b/src/main/java/gtc_expansion/container/GTCXContainerBath.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerBath.java rename to src/main/java/gtc_expansion/container/GTCXContainerBath.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerBurnableFluidGenerator.java b/src/main/java/gtc_expansion/container/GTCXContainerBurnableFluidGenerator.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerBurnableFluidGenerator.java rename to src/main/java/gtc_expansion/container/GTCXContainerBurnableFluidGenerator.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerCentrifuge.java b/src/main/java/gtc_expansion/container/GTCXContainerCentrifuge.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerCentrifuge.java rename to src/main/java/gtc_expansion/container/GTCXContainerCentrifuge.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerChemicalReactor.java b/src/main/java/gtc_expansion/container/GTCXContainerChemicalReactor.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerChemicalReactor.java rename to src/main/java/gtc_expansion/container/GTCXContainerChemicalReactor.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerCoalBoiler.java b/src/main/java/gtc_expansion/container/GTCXContainerCoalBoiler.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerCoalBoiler.java rename to src/main/java/gtc_expansion/container/GTCXContainerCoalBoiler.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerCokeOven.java b/src/main/java/gtc_expansion/container/GTCXContainerCokeOven.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerCokeOven.java rename to src/main/java/gtc_expansion/container/GTCXContainerCokeOven.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerDigitalTank.java b/src/main/java/gtc_expansion/container/GTCXContainerDigitalTank.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerDigitalTank.java rename to src/main/java/gtc_expansion/container/GTCXContainerDigitalTank.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerDistillationTower.java b/src/main/java/gtc_expansion/container/GTCXContainerDistillationTower.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerDistillationTower.java rename to src/main/java/gtc_expansion/container/GTCXContainerDistillationTower.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerDustbin.java b/src/main/java/gtc_expansion/container/GTCXContainerDustbin.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerDustbin.java rename to src/main/java/gtc_expansion/container/GTCXContainerDustbin.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerElectrolyzer.java b/src/main/java/gtc_expansion/container/GTCXContainerElectrolyzer.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerElectrolyzer.java rename to src/main/java/gtc_expansion/container/GTCXContainerElectrolyzer.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerExtruder.java b/src/main/java/gtc_expansion/container/GTCXContainerExtruder.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerExtruder.java rename to src/main/java/gtc_expansion/container/GTCXContainerExtruder.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerFluidCaster.java b/src/main/java/gtc_expansion/container/GTCXContainerFluidCaster.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerFluidCaster.java rename to src/main/java/gtc_expansion/container/GTCXContainerFluidCaster.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerFluidSmelter.java b/src/main/java/gtc_expansion/container/GTCXContainerFluidSmelter.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerFluidSmelter.java rename to src/main/java/gtc_expansion/container/GTCXContainerFluidSmelter.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerFusionReactor.java b/src/main/java/gtc_expansion/container/GTCXContainerFusionReactor.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerFusionReactor.java rename to src/main/java/gtc_expansion/container/GTCXContainerFusionReactor.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerFusionReactorHatch.java b/src/main/java/gtc_expansion/container/GTCXContainerFusionReactorHatch.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerFusionReactorHatch.java rename to src/main/java/gtc_expansion/container/GTCXContainerFusionReactorHatch.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerImplosionCompressor.java b/src/main/java/gtc_expansion/container/GTCXContainerImplosionCompressor.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerImplosionCompressor.java rename to src/main/java/gtc_expansion/container/GTCXContainerImplosionCompressor.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerIndustrialBlastFurnace.java b/src/main/java/gtc_expansion/container/GTCXContainerIndustrialBlastFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerIndustrialBlastFurnace.java rename to src/main/java/gtc_expansion/container/GTCXContainerIndustrialBlastFurnace.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerIndustrialGrinder.java b/src/main/java/gtc_expansion/container/GTCXContainerIndustrialGrinder.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerIndustrialGrinder.java rename to src/main/java/gtc_expansion/container/GTCXContainerIndustrialGrinder.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerIndustrialSawmill.java b/src/main/java/gtc_expansion/container/GTCXContainerIndustrialSawmill.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerIndustrialSawmill.java rename to src/main/java/gtc_expansion/container/GTCXContainerIndustrialSawmill.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerItemFluidHatch.java b/src/main/java/gtc_expansion/container/GTCXContainerItemFluidHatch.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerItemFluidHatch.java rename to src/main/java/gtc_expansion/container/GTCXContainerItemFluidHatch.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerLargeGasTurbine.java b/src/main/java/gtc_expansion/container/GTCXContainerLargeGasTurbine.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerLargeGasTurbine.java rename to src/main/java/gtc_expansion/container/GTCXContainerLargeGasTurbine.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerLargeGasTurbineHatch.java b/src/main/java/gtc_expansion/container/GTCXContainerLargeGasTurbineHatch.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerLargeGasTurbineHatch.java rename to src/main/java/gtc_expansion/container/GTCXContainerLargeGasTurbineHatch.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerLargeSteamTurbine.java b/src/main/java/gtc_expansion/container/GTCXContainerLargeSteamTurbine.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerLargeSteamTurbine.java rename to src/main/java/gtc_expansion/container/GTCXContainerLargeSteamTurbine.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerLargeSteamTurbineHatch.java b/src/main/java/gtc_expansion/container/GTCXContainerLargeSteamTurbineHatch.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerLargeSteamTurbineHatch.java rename to src/main/java/gtc_expansion/container/GTCXContainerLargeSteamTurbineHatch.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerLathe.java b/src/main/java/gtc_expansion/container/GTCXContainerLathe.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerLathe.java rename to src/main/java/gtc_expansion/container/GTCXContainerLathe.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerLocker.java b/src/main/java/gtc_expansion/container/GTCXContainerLocker.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerLocker.java rename to src/main/java/gtc_expansion/container/GTCXContainerLocker.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerMicrowave.java b/src/main/java/gtc_expansion/container/GTCXContainerMicrowave.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerMicrowave.java rename to src/main/java/gtc_expansion/container/GTCXContainerMicrowave.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerPlateBender.java b/src/main/java/gtc_expansion/container/GTCXContainerPlateBender.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerPlateBender.java rename to src/main/java/gtc_expansion/container/GTCXContainerPlateBender.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerPlateCutter.java b/src/main/java/gtc_expansion/container/GTCXContainerPlateCutter.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerPlateCutter.java rename to src/main/java/gtc_expansion/container/GTCXContainerPlateCutter.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerPrimitiveBlastFurnace.java b/src/main/java/gtc_expansion/container/GTCXContainerPrimitiveBlastFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerPrimitiveBlastFurnace.java rename to src/main/java/gtc_expansion/container/GTCXContainerPrimitiveBlastFurnace.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerScanner.java b/src/main/java/gtc_expansion/container/GTCXContainerScanner.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerScanner.java rename to src/main/java/gtc_expansion/container/GTCXContainerScanner.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerSteamAlloySmelter.java b/src/main/java/gtc_expansion/container/GTCXContainerSteamAlloySmelter.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerSteamAlloySmelter.java rename to src/main/java/gtc_expansion/container/GTCXContainerSteamAlloySmelter.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerSteamCompressor.java b/src/main/java/gtc_expansion/container/GTCXContainerSteamCompressor.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerSteamCompressor.java rename to src/main/java/gtc_expansion/container/GTCXContainerSteamCompressor.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerSteamExtractor.java b/src/main/java/gtc_expansion/container/GTCXContainerSteamExtractor.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerSteamExtractor.java rename to src/main/java/gtc_expansion/container/GTCXContainerSteamExtractor.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerSteamForgeHammer.java b/src/main/java/gtc_expansion/container/GTCXContainerSteamForgeHammer.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerSteamForgeHammer.java rename to src/main/java/gtc_expansion/container/GTCXContainerSteamForgeHammer.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerSteamFurnace.java b/src/main/java/gtc_expansion/container/GTCXContainerSteamFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerSteamFurnace.java rename to src/main/java/gtc_expansion/container/GTCXContainerSteamFurnace.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerSteamMacerator.java b/src/main/java/gtc_expansion/container/GTCXContainerSteamMacerator.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerSteamMacerator.java rename to src/main/java/gtc_expansion/container/GTCXContainerSteamMacerator.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerStoneCompressor.java b/src/main/java/gtc_expansion/container/GTCXContainerStoneCompressor.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerStoneCompressor.java rename to src/main/java/gtc_expansion/container/GTCXContainerStoneCompressor.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerStoneExtractor.java b/src/main/java/gtc_expansion/container/GTCXContainerStoneExtractor.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerStoneExtractor.java rename to src/main/java/gtc_expansion/container/GTCXContainerStoneExtractor.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerThermalBoiler.java b/src/main/java/gtc_expansion/container/GTCXContainerThermalBoiler.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerThermalBoiler.java rename to src/main/java/gtc_expansion/container/GTCXContainerThermalBoiler.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerThermalBoilerHatch.java b/src/main/java/gtc_expansion/container/GTCXContainerThermalBoilerHatch.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerThermalBoilerHatch.java rename to src/main/java/gtc_expansion/container/GTCXContainerThermalBoilerHatch.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerTrashBin.java b/src/main/java/gtc_expansion/container/GTCXContainerTrashBin.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerTrashBin.java rename to src/main/java/gtc_expansion/container/GTCXContainerTrashBin.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerVacuumFreezer.java b/src/main/java/gtc_expansion/container/GTCXContainerVacuumFreezer.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerVacuumFreezer.java rename to src/main/java/gtc_expansion/container/GTCXContainerVacuumFreezer.java diff --git a/src/main/java/vgt_expansion/container/GTCXContainerWiremill.java b/src/main/java/gtc_expansion/container/GTCXContainerWiremill.java similarity index 100% rename from src/main/java/vgt_expansion/container/GTCXContainerWiremill.java rename to src/main/java/gtc_expansion/container/GTCXContainerWiremill.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXAlloySmelterSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXAlloySmelterSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXAlloySmelterSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXAlloySmelterSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXAssemblingMachineSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXAssemblingMachineSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXAssemblingMachineSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXAssemblingMachineSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXBlastFurnaceSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXBlastFurnaceSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXBlastFurnaceSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXBlastFurnaceSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXCentrifugeSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXCentrifugeSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXCentrifugeSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXCentrifugeSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXChemicalReactorSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXChemicalReactorSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXChemicalReactorSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXChemicalReactorSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXDieselGeneratorSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXDieselGeneratorSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXDieselGeneratorSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXDieselGeneratorSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXDistillationTowerSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXDistillationTowerSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXDistillationTowerSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXDistillationTowerSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXElectrolyzerSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXElectrolyzerSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXElectrolyzerSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXElectrolyzerSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXExtruderSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXExtruderSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXExtruderSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXExtruderSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXFluidCasterSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXFluidCasterSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXFluidCasterSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXFluidCasterSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXFluidSmelterSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXFluidSmelterSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXFluidSmelterSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXFluidSmelterSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXForgeHammerSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXForgeHammerSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXForgeHammerSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXForgeHammerSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXFusionSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXFusionSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXFusionSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXFusionSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXGasTurbineSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXGasTurbineSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXGasTurbineSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXGasTurbineSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXImplosionCompressorSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXImplosionCompressorSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXImplosionCompressorSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXImplosionCompressorSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXIndustrialGrinderSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXIndustrialGrinderSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXIndustrialGrinderSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXIndustrialGrinderSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXIndustrialSawmillSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXIndustrialSawmillSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXIndustrialSawmillSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXIndustrialSawmillSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXLatheSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXLatheSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXLatheSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXLatheSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXPlateBenderSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXPlateBenderSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXPlateBenderSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXPlateBenderSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXPlateCutterSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXPlateCutterSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXPlateCutterSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXPlateCutterSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXRadiationSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXRadiationSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXRadiationSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXRadiationSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXVacuumFreezerSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXVacuumFreezerSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXVacuumFreezerSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXVacuumFreezerSupport.java diff --git a/src/main/java/vgt_expansion/crafttweaker/GTCXWiremillSupport.java b/src/main/java/gtc_expansion/crafttweaker/GTCXWiremillSupport.java similarity index 100% rename from src/main/java/vgt_expansion/crafttweaker/GTCXWiremillSupport.java rename to src/main/java/gtc_expansion/crafttweaker/GTCXWiremillSupport.java diff --git a/src/main/java/vgt_expansion/data/GTCXBlocks.java b/src/main/java/gtc_expansion/data/GTCXBlocks.java similarity index 100% rename from src/main/java/vgt_expansion/data/GTCXBlocks.java rename to src/main/java/gtc_expansion/data/GTCXBlocks.java diff --git a/src/main/java/vgt_expansion/data/GTCXItems.java b/src/main/java/gtc_expansion/data/GTCXItems.java similarity index 100% rename from src/main/java/vgt_expansion/data/GTCXItems.java rename to src/main/java/gtc_expansion/data/GTCXItems.java diff --git a/src/main/java/vgt_expansion/data/GTCXLang.java b/src/main/java/gtc_expansion/data/GTCXLang.java similarity index 100% rename from src/main/java/vgt_expansion/data/GTCXLang.java rename to src/main/java/gtc_expansion/data/GTCXLang.java diff --git a/src/main/java/vgt_expansion/data/GTCXPipes.java b/src/main/java/gtc_expansion/data/GTCXPipes.java similarity index 100% rename from src/main/java/vgt_expansion/data/GTCXPipes.java rename to src/main/java/gtc_expansion/data/GTCXPipes.java diff --git a/src/main/java/vgt_expansion/data/GTCXValues.java b/src/main/java/gtc_expansion/data/GTCXValues.java similarity index 100% rename from src/main/java/vgt_expansion/data/GTCXValues.java rename to src/main/java/gtc_expansion/data/GTCXValues.java diff --git a/src/main/java/vgt_expansion/entity/GTCXEntityElectricBoat.java b/src/main/java/gtc_expansion/entity/GTCXEntityElectricBoat.java similarity index 100% rename from src/main/java/vgt_expansion/entity/GTCXEntityElectricBoat.java rename to src/main/java/gtc_expansion/entity/GTCXEntityElectricBoat.java diff --git a/src/main/java/vgt_expansion/events/GTCXOtherEvents.java b/src/main/java/gtc_expansion/events/GTCXOtherEvents.java similarity index 100% rename from src/main/java/vgt_expansion/events/GTCXOtherEvents.java rename to src/main/java/gtc_expansion/events/GTCXOtherEvents.java diff --git a/src/main/java/vgt_expansion/events/GTCXRadiationEvent.java b/src/main/java/gtc_expansion/events/GTCXRadiationEvent.java similarity index 100% rename from src/main/java/vgt_expansion/events/GTCXRadiationEvent.java rename to src/main/java/gtc_expansion/events/GTCXRadiationEvent.java diff --git a/src/main/java/vgt_expansion/events/GTCXServerTickEvent.java b/src/main/java/gtc_expansion/events/GTCXServerTickEvent.java similarity index 100% rename from src/main/java/vgt_expansion/events/GTCXServerTickEvent.java rename to src/main/java/gtc_expansion/events/GTCXServerTickEvent.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiCompCoalBoiler.java b/src/main/java/gtc_expansion/gui/GTCXGuiCompCoalBoiler.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiCompCoalBoiler.java rename to src/main/java/gtc_expansion/gui/GTCXGuiCompCoalBoiler.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiCompDigitalTank.java b/src/main/java/gtc_expansion/gui/GTCXGuiCompDigitalTank.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiCompDigitalTank.java rename to src/main/java/gtc_expansion/gui/GTCXGuiCompDigitalTank.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiCompFusionButtons.java b/src/main/java/gtc_expansion/gui/GTCXGuiCompFusionButtons.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiCompFusionButtons.java rename to src/main/java/gtc_expansion/gui/GTCXGuiCompFusionButtons.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiCompFusionOverlay.java b/src/main/java/gtc_expansion/gui/GTCXGuiCompFusionOverlay.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiCompFusionOverlay.java rename to src/main/java/gtc_expansion/gui/GTCXGuiCompFusionOverlay.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiCompMachineSteam.java b/src/main/java/gtc_expansion/gui/GTCXGuiCompMachineSteam.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiCompMachineSteam.java rename to src/main/java/gtc_expansion/gui/GTCXGuiCompMachineSteam.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiCompMultiblockProductionString.java b/src/main/java/gtc_expansion/gui/GTCXGuiCompMultiblockProductionString.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiCompMultiblockProductionString.java rename to src/main/java/gtc_expansion/gui/GTCXGuiCompMultiblockProductionString.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiCompMultiblockStatusString.java b/src/main/java/gtc_expansion/gui/GTCXGuiCompMultiblockStatusString.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiCompMultiblockStatusString.java rename to src/main/java/gtc_expansion/gui/GTCXGuiCompMultiblockStatusString.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiICompFluidSmelterString.java b/src/main/java/gtc_expansion/gui/GTCXGuiICompFluidSmelterString.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiICompFluidSmelterString.java rename to src/main/java/gtc_expansion/gui/GTCXGuiICompFluidSmelterString.java diff --git a/src/main/java/vgt_expansion/gui/GTCXGuiICompIBFString.java b/src/main/java/gtc_expansion/gui/GTCXGuiICompIBFString.java similarity index 100% rename from src/main/java/vgt_expansion/gui/GTCXGuiICompIBFString.java rename to src/main/java/gtc_expansion/gui/GTCXGuiICompIBFString.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTCapabilityTile.java b/src/main/java/gtc_expansion/interfaces/IGTCapabilityTile.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTCapabilityTile.java rename to src/main/java/gtc_expansion/interfaces/IGTCapabilityTile.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTCasingBackgroundBlock.java b/src/main/java/gtc_expansion/interfaces/IGTCasingBackgroundBlock.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTCasingBackgroundBlock.java rename to src/main/java/gtc_expansion/interfaces/IGTCasingBackgroundBlock.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTCoverBlock.java b/src/main/java/gtc_expansion/interfaces/IGTCoverBlock.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTCoverBlock.java rename to src/main/java/gtc_expansion/interfaces/IGTCoverBlock.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTEnergySource.java b/src/main/java/gtc_expansion/interfaces/IGTEnergySource.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTEnergySource.java rename to src/main/java/gtc_expansion/interfaces/IGTEnergySource.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTMultiTileProduction.java b/src/main/java/gtc_expansion/interfaces/IGTMultiTileProduction.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTMultiTileProduction.java rename to src/main/java/gtc_expansion/interfaces/IGTMultiTileProduction.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTOwnerTile.java b/src/main/java/gtc_expansion/interfaces/IGTOwnerTile.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTOwnerTile.java rename to src/main/java/gtc_expansion/interfaces/IGTOwnerTile.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTScrewdriver.java b/src/main/java/gtc_expansion/interfaces/IGTScrewdriver.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTScrewdriver.java rename to src/main/java/gtc_expansion/interfaces/IGTScrewdriver.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTTextureStorageTile.java b/src/main/java/gtc_expansion/interfaces/IGTTextureStorageTile.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTTextureStorageTile.java rename to src/main/java/gtc_expansion/interfaces/IGTTextureStorageTile.java diff --git a/src/main/java/vgt_expansion/interfaces/IGTWrench.java b/src/main/java/gtc_expansion/interfaces/IGTWrench.java similarity index 100% rename from src/main/java/vgt_expansion/interfaces/IGTWrench.java rename to src/main/java/gtc_expansion/interfaces/IGTWrench.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemBatteryReusable.java b/src/main/java/gtc_expansion/item/GTCXItemBatteryReusable.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemBatteryReusable.java rename to src/main/java/gtc_expansion/item/GTCXItemBatteryReusable.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemBatterySingleUse.java b/src/main/java/gtc_expansion/item/GTCXItemBatterySingleUse.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemBatterySingleUse.java rename to src/main/java/gtc_expansion/item/GTCXItemBatterySingleUse.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemContainerDamageless.java b/src/main/java/gtc_expansion/item/GTCXItemContainerDamageless.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemContainerDamageless.java rename to src/main/java/gtc_expansion/item/GTCXItemContainerDamageless.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemCover.java b/src/main/java/gtc_expansion/item/GTCXItemCover.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemCover.java rename to src/main/java/gtc_expansion/item/GTCXItemCover.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemDamageable.java b/src/main/java/gtc_expansion/item/GTCXItemDamageable.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemDamageable.java rename to src/main/java/gtc_expansion/item/GTCXItemDamageable.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemDataOrbStorage.java b/src/main/java/gtc_expansion/item/GTCXItemDataOrbStorage.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemDataOrbStorage.java rename to src/main/java/gtc_expansion/item/GTCXItemDataOrbStorage.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemDiamondChainsaw.java b/src/main/java/gtc_expansion/item/GTCXItemDiamondChainsaw.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemDiamondChainsaw.java rename to src/main/java/gtc_expansion/item/GTCXItemDiamondChainsaw.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemElectricScrewdriver.java b/src/main/java/gtc_expansion/item/GTCXItemElectricScrewdriver.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemElectricScrewdriver.java rename to src/main/java/gtc_expansion/item/GTCXItemElectricScrewdriver.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemFood.java b/src/main/java/gtc_expansion/item/GTCXItemFood.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemFood.java rename to src/main/java/gtc_expansion/item/GTCXItemFood.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemHardeningSpray.java b/src/main/java/gtc_expansion/item/GTCXItemHardeningSpray.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemHardeningSpray.java rename to src/main/java/gtc_expansion/item/GTCXItemHardeningSpray.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemInsulationCutter.java b/src/main/java/gtc_expansion/item/GTCXItemInsulationCutter.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemInsulationCutter.java rename to src/main/java/gtc_expansion/item/GTCXItemInsulationCutter.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemIntegratedCircuit.java b/src/main/java/gtc_expansion/item/GTCXItemIntegratedCircuit.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemIntegratedCircuit.java rename to src/main/java/gtc_expansion/item/GTCXItemIntegratedCircuit.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemMatch.java b/src/main/java/gtc_expansion/item/GTCXItemMatch.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemMatch.java rename to src/main/java/gtc_expansion/item/GTCXItemMatch.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemMatchBox.java b/src/main/java/gtc_expansion/item/GTCXItemMatchBox.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemMatchBox.java rename to src/main/java/gtc_expansion/item/GTCXItemMatchBox.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemMisc.java b/src/main/java/gtc_expansion/item/GTCXItemMisc.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemMisc.java rename to src/main/java/gtc_expansion/item/GTCXItemMisc.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemMiscSpriteless.java b/src/main/java/gtc_expansion/item/GTCXItemMiscSpriteless.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemMiscSpriteless.java rename to src/main/java/gtc_expansion/item/GTCXItemMiscSpriteless.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemMold.java b/src/main/java/gtc_expansion/item/GTCXItemMold.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemMold.java rename to src/main/java/gtc_expansion/item/GTCXItemMold.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemSteelJackHammer.java b/src/main/java/gtc_expansion/item/GTCXItemSteelJackHammer.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemSteelJackHammer.java rename to src/main/java/gtc_expansion/item/GTCXItemSteelJackHammer.java diff --git a/src/main/java/vgt_expansion/item/GTCXItemTurbineRotor.java b/src/main/java/gtc_expansion/item/GTCXItemTurbineRotor.java similarity index 100% rename from src/main/java/vgt_expansion/item/GTCXItemTurbineRotor.java rename to src/main/java/gtc_expansion/item/GTCXItemTurbineRotor.java diff --git a/src/main/java/vgt_expansion/item/itemblock/GTCXColorItemBlock.java b/src/main/java/gtc_expansion/item/itemblock/GTCXColorItemBlock.java similarity index 100% rename from src/main/java/vgt_expansion/item/itemblock/GTCXColorItemBlock.java rename to src/main/java/gtc_expansion/item/itemblock/GTCXColorItemBlock.java diff --git a/src/main/java/vgt_expansion/item/itemblock/GTCXItemBlockPipe.java b/src/main/java/gtc_expansion/item/itemblock/GTCXItemBlockPipe.java similarity index 100% rename from src/main/java/vgt_expansion/item/itemblock/GTCXItemBlockPipe.java rename to src/main/java/gtc_expansion/item/itemblock/GTCXItemBlockPipe.java diff --git a/src/main/java/vgt_expansion/item/overrides/GTCXItemBlockMachineLV.java b/src/main/java/gtc_expansion/item/overrides/GTCXItemBlockMachineLV.java similarity index 100% rename from src/main/java/vgt_expansion/item/overrides/GTCXItemBlockMachineLV.java rename to src/main/java/gtc_expansion/item/overrides/GTCXItemBlockMachineLV.java diff --git a/src/main/java/vgt_expansion/item/overrides/GTCXItemDrill.java b/src/main/java/gtc_expansion/item/overrides/GTCXItemDrill.java similarity index 100% rename from src/main/java/vgt_expansion/item/overrides/GTCXItemDrill.java rename to src/main/java/gtc_expansion/item/overrides/GTCXItemDrill.java diff --git a/src/main/java/vgt_expansion/item/overrides/GTCXItemElectricBoat.java b/src/main/java/gtc_expansion/item/overrides/GTCXItemElectricBoat.java similarity index 100% rename from src/main/java/vgt_expansion/item/overrides/GTCXItemElectricBoat.java rename to src/main/java/gtc_expansion/item/overrides/GTCXItemElectricBoat.java diff --git a/src/main/java/vgt_expansion/item/overrides/GTCXItemElectricWrench.java b/src/main/java/gtc_expansion/item/overrides/GTCXItemElectricWrench.java similarity index 100% rename from src/main/java/vgt_expansion/item/overrides/GTCXItemElectricWrench.java rename to src/main/java/gtc_expansion/item/overrides/GTCXItemElectricWrench.java diff --git a/src/main/java/vgt_expansion/item/overrides/GTCXItemPrecisionWrench.java b/src/main/java/gtc_expansion/item/overrides/GTCXItemPrecisionWrench.java similarity index 100% rename from src/main/java/vgt_expansion/item/overrides/GTCXItemPrecisionWrench.java rename to src/main/java/gtc_expansion/item/overrides/GTCXItemPrecisionWrench.java diff --git a/src/main/java/vgt_expansion/item/overrides/GTCXItemUpgrade.java b/src/main/java/gtc_expansion/item/overrides/GTCXItemUpgrade.java similarity index 100% rename from src/main/java/vgt_expansion/item/overrides/GTCXItemUpgrade.java rename to src/main/java/gtc_expansion/item/overrides/GTCXItemUpgrade.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolAxe.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolAxe.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolAxe.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolAxe.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolBranchCutter.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolBranchCutter.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolBranchCutter.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolBranchCutter.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolCrowbar.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolCrowbar.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolCrowbar.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolCrowbar.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolFile.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolFile.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolFile.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolFile.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolHammer.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolHammer.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolHammer.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolHammer.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolPickaxe.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolPickaxe.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolPickaxe.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolPickaxe.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolSaw.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolSaw.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolSaw.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolSaw.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolScrewdriver.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolScrewdriver.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolScrewdriver.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolScrewdriver.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolShovel.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolShovel.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolShovel.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolShovel.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolSword.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolSword.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolSword.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolSword.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXItemToolWrench.java b/src/main/java/gtc_expansion/item/tools/GTCXItemToolWrench.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXItemToolWrench.java rename to src/main/java/gtc_expansion/item/tools/GTCXItemToolWrench.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXToolGen.java b/src/main/java/gtc_expansion/item/tools/GTCXToolGen.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXToolGen.java rename to src/main/java/gtc_expansion/item/tools/GTCXToolGen.java diff --git a/src/main/java/vgt_expansion/item/tools/GTCXToolMaterial.java b/src/main/java/gtc_expansion/item/tools/GTCXToolMaterial.java similarity index 100% rename from src/main/java/vgt_expansion/item/tools/GTCXToolMaterial.java rename to src/main/java/gtc_expansion/item/tools/GTCXToolMaterial.java diff --git a/src/main/java/vgt_expansion/jei/GTCXJeiPlugin.java b/src/main/java/gtc_expansion/jei/GTCXJeiPlugin.java similarity index 100% rename from src/main/java/vgt_expansion/jei/GTCXJeiPlugin.java rename to src/main/java/gtc_expansion/jei/GTCXJeiPlugin.java diff --git a/src/main/java/vgt_expansion/jei/category/GTCXJeiBurnableFluidCategory.java b/src/main/java/gtc_expansion/jei/category/GTCXJeiBurnableFluidCategory.java similarity index 100% rename from src/main/java/vgt_expansion/jei/category/GTCXJeiBurnableFluidCategory.java rename to src/main/java/gtc_expansion/jei/category/GTCXJeiBurnableFluidCategory.java diff --git a/src/main/java/vgt_expansion/jei/category/GTCXJeiCauldronCategory.java b/src/main/java/gtc_expansion/jei/category/GTCXJeiCauldronCategory.java similarity index 100% rename from src/main/java/vgt_expansion/jei/category/GTCXJeiCauldronCategory.java rename to src/main/java/gtc_expansion/jei/category/GTCXJeiCauldronCategory.java diff --git a/src/main/java/vgt_expansion/jei/category/GTCXJeiCustomCategory.java b/src/main/java/gtc_expansion/jei/category/GTCXJeiCustomCategory.java similarity index 100% rename from src/main/java/vgt_expansion/jei/category/GTCXJeiCustomCategory.java rename to src/main/java/gtc_expansion/jei/category/GTCXJeiCustomCategory.java diff --git a/src/main/java/vgt_expansion/jei/category/GTCXJeiIntegratedCircuitCategory.java b/src/main/java/gtc_expansion/jei/category/GTCXJeiIntegratedCircuitCategory.java similarity index 100% rename from src/main/java/vgt_expansion/jei/category/GTCXJeiIntegratedCircuitCategory.java rename to src/main/java/gtc_expansion/jei/category/GTCXJeiIntegratedCircuitCategory.java diff --git a/src/main/java/vgt_expansion/jei/wrapper/GTCXJeiBurnableFluidWrapper.java b/src/main/java/gtc_expansion/jei/wrapper/GTCXJeiBurnableFluidWrapper.java similarity index 100% rename from src/main/java/vgt_expansion/jei/wrapper/GTCXJeiBurnableFluidWrapper.java rename to src/main/java/gtc_expansion/jei/wrapper/GTCXJeiBurnableFluidWrapper.java diff --git a/src/main/java/vgt_expansion/jei/wrapper/GTCXJeiCasterWrapper.java b/src/main/java/gtc_expansion/jei/wrapper/GTCXJeiCasterWrapper.java similarity index 100% rename from src/main/java/vgt_expansion/jei/wrapper/GTCXJeiCasterWrapper.java rename to src/main/java/gtc_expansion/jei/wrapper/GTCXJeiCasterWrapper.java diff --git a/src/main/java/vgt_expansion/jei/wrapper/GTCXJeiFusionWrapper.java b/src/main/java/gtc_expansion/jei/wrapper/GTCXJeiFusionWrapper.java similarity index 100% rename from src/main/java/vgt_expansion/jei/wrapper/GTCXJeiFusionWrapper.java rename to src/main/java/gtc_expansion/jei/wrapper/GTCXJeiFusionWrapper.java diff --git a/src/main/java/vgt_expansion/jei/wrapper/GTCXJeiHeatWrapper.java b/src/main/java/gtc_expansion/jei/wrapper/GTCXJeiHeatWrapper.java similarity index 100% rename from src/main/java/vgt_expansion/jei/wrapper/GTCXJeiHeatWrapper.java rename to src/main/java/gtc_expansion/jei/wrapper/GTCXJeiHeatWrapper.java diff --git a/src/main/java/vgt_expansion/jei/wrapper/GTCXJeiIntegratedCircuitWrapper.java b/src/main/java/gtc_expansion/jei/wrapper/GTCXJeiIntegratedCircuitWrapper.java similarity index 100% rename from src/main/java/vgt_expansion/jei/wrapper/GTCXJeiIntegratedCircuitWrapper.java rename to src/main/java/gtc_expansion/jei/wrapper/GTCXJeiIntegratedCircuitWrapper.java diff --git a/src/main/java/vgt_expansion/logic/GTCXBaseCoverLogic.java b/src/main/java/gtc_expansion/logic/GTCXBaseCoverLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXBaseCoverLogic.java rename to src/main/java/gtc_expansion/logic/GTCXBaseCoverLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXConveyorModuleLogic.java b/src/main/java/gtc_expansion/logic/GTCXConveyorModuleLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXConveyorModuleLogic.java rename to src/main/java/gtc_expansion/logic/GTCXConveyorModuleLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXDrainModuleLogic.java b/src/main/java/gtc_expansion/logic/GTCXDrainModuleLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXDrainModuleLogic.java rename to src/main/java/gtc_expansion/logic/GTCXDrainModuleLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXFluidFilterLogic.java b/src/main/java/gtc_expansion/logic/GTCXFluidFilterLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXFluidFilterLogic.java rename to src/main/java/gtc_expansion/logic/GTCXFluidFilterLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXItemValveModuleLogic.java b/src/main/java/gtc_expansion/logic/GTCXItemValveModuleLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXItemValveModuleLogic.java rename to src/main/java/gtc_expansion/logic/GTCXItemValveModuleLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXNullLogic.java b/src/main/java/gtc_expansion/logic/GTCXNullLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXNullLogic.java rename to src/main/java/gtc_expansion/logic/GTCXNullLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXPumpModuleLogic.java b/src/main/java/gtc_expansion/logic/GTCXPumpModuleLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXPumpModuleLogic.java rename to src/main/java/gtc_expansion/logic/GTCXPumpModuleLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXRedstoneControllerLogic.java b/src/main/java/gtc_expansion/logic/GTCXRedstoneControllerLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXRedstoneControllerLogic.java rename to src/main/java/gtc_expansion/logic/GTCXRedstoneControllerLogic.java diff --git a/src/main/java/vgt_expansion/logic/GTCXShutterLogic.java b/src/main/java/gtc_expansion/logic/GTCXShutterLogic.java similarity index 100% rename from src/main/java/vgt_expansion/logic/GTCXShutterLogic.java rename to src/main/java/gtc_expansion/logic/GTCXShutterLogic.java diff --git a/src/main/java/vgt_expansion/material/GTCXMaterial.java b/src/main/java/gtc_expansion/material/GTCXMaterial.java similarity index 100% rename from src/main/java/vgt_expansion/material/GTCXMaterial.java rename to src/main/java/gtc_expansion/material/GTCXMaterial.java diff --git a/src/main/java/vgt_expansion/material/GTCXMaterialDict.java b/src/main/java/gtc_expansion/material/GTCXMaterialDict.java similarity index 100% rename from src/main/java/vgt_expansion/material/GTCXMaterialDict.java rename to src/main/java/gtc_expansion/material/GTCXMaterialDict.java diff --git a/src/main/java/vgt_expansion/material/GTCXMaterialGen.java b/src/main/java/gtc_expansion/material/GTCXMaterialGen.java similarity index 100% rename from src/main/java/vgt_expansion/material/GTCXMaterialGen.java rename to src/main/java/gtc_expansion/material/GTCXMaterialGen.java diff --git a/src/main/java/vgt_expansion/material/GTCXMaterialItemHot.java b/src/main/java/gtc_expansion/material/GTCXMaterialItemHot.java similarity index 100% rename from src/main/java/vgt_expansion/material/GTCXMaterialItemHot.java rename to src/main/java/gtc_expansion/material/GTCXMaterialItemHot.java diff --git a/src/main/java/gtc_expansion/mixin/LateMixin.java b/src/main/java/gtc_expansion/mixin/LateMixin.java new file mode 100644 index 00000000..317527f0 --- /dev/null +++ b/src/main/java/gtc_expansion/mixin/LateMixin.java @@ -0,0 +1,20 @@ +package gtc_expansion.mixin; + +import com.google.common.collect.ImmutableList; +import gtc_expansion.GTCExpansion; +import net.minecraftforge.fml.common.Loader; +import zone.rong.mixinbooter.ILateMixinLoader; + +import java.util.List; +import java.util.stream.Collectors; + +public class LateMixin implements ILateMixinLoader { + public static final List modMixins = ImmutableList.of( + //"ic2c_extras" + ); + + @Override + public List getMixinConfigs() { + return modMixins.stream().filter(Loader::isModLoaded).map(mod -> "mixin."+ GTCExpansion.MODID +"." + mod + ".json").collect(Collectors.toList()); + } +} diff --git a/src/main/java/vgt_expansion/model/GTCXModelCasing.java b/src/main/java/gtc_expansion/model/GTCXModelCasing.java similarity index 100% rename from src/main/java/vgt_expansion/model/GTCXModelCasing.java rename to src/main/java/gtc_expansion/model/GTCXModelCasing.java diff --git a/src/main/java/vgt_expansion/model/GTCXModelHatch.java b/src/main/java/gtc_expansion/model/GTCXModelHatch.java similarity index 100% rename from src/main/java/vgt_expansion/model/GTCXModelHatch.java rename to src/main/java/gtc_expansion/model/GTCXModelHatch.java diff --git a/src/main/java/vgt_expansion/model/GTCXModelPipe.java b/src/main/java/gtc_expansion/model/GTCXModelPipe.java similarity index 100% rename from src/main/java/vgt_expansion/model/GTCXModelPipe.java rename to src/main/java/gtc_expansion/model/GTCXModelPipe.java diff --git a/src/main/java/vgt_expansion/model/GTCXModelPipeFullBlock.java b/src/main/java/gtc_expansion/model/GTCXModelPipeFullBlock.java similarity index 100% rename from src/main/java/vgt_expansion/model/GTCXModelPipeFullBlock.java rename to src/main/java/gtc_expansion/model/GTCXModelPipeFullBlock.java diff --git a/src/main/java/vgt_expansion/model/GTModelLayeredAnchoredWire.java b/src/main/java/gtc_expansion/model/GTModelLayeredAnchoredWire.java similarity index 100% rename from src/main/java/vgt_expansion/model/GTModelLayeredAnchoredWire.java rename to src/main/java/gtc_expansion/model/GTModelLayeredAnchoredWire.java diff --git a/src/main/java/vgt_expansion/oneprobe/GTCXOneProbePlugin.java b/src/main/java/gtc_expansion/oneprobe/GTCXOneProbePlugin.java similarity index 100% rename from src/main/java/vgt_expansion/oneprobe/GTCXOneProbePlugin.java rename to src/main/java/gtc_expansion/oneprobe/GTCXOneProbePlugin.java diff --git a/src/main/java/vgt_expansion/oneprobe/GTCXProbeHandler.java b/src/main/java/gtc_expansion/oneprobe/GTCXProbeHandler.java similarity index 100% rename from src/main/java/vgt_expansion/oneprobe/GTCXProbeHandler.java rename to src/main/java/gtc_expansion/oneprobe/GTCXProbeHandler.java diff --git a/src/main/java/vgt_expansion/oneprobe/GTCXProbeModule.java b/src/main/java/gtc_expansion/oneprobe/GTCXProbeModule.java similarity index 100% rename from src/main/java/vgt_expansion/oneprobe/GTCXProbeModule.java rename to src/main/java/gtc_expansion/oneprobe/GTCXProbeModule.java diff --git a/src/main/java/vgt_expansion/proxy/GTCXClientProxy.java b/src/main/java/gtc_expansion/proxy/GTCXClientProxy.java similarity index 100% rename from src/main/java/vgt_expansion/proxy/GTCXClientProxy.java rename to src/main/java/gtc_expansion/proxy/GTCXClientProxy.java diff --git a/src/main/java/vgt_expansion/proxy/GTCXCommonProxy.java b/src/main/java/gtc_expansion/proxy/GTCXCommonProxy.java similarity index 100% rename from src/main/java/vgt_expansion/proxy/GTCXCommonProxy.java rename to src/main/java/gtc_expansion/proxy/GTCXCommonProxy.java diff --git a/src/main/java/vgt_expansion/recipes/GTCXRecipe.java b/src/main/java/gtc_expansion/recipes/GTCXRecipe.java similarity index 100% rename from src/main/java/vgt_expansion/recipes/GTCXRecipe.java rename to src/main/java/gtc_expansion/recipes/GTCXRecipe.java diff --git a/src/main/java/vgt_expansion/recipes/GTCXRecipeIterators.java b/src/main/java/gtc_expansion/recipes/GTCXRecipeIterators.java similarity index 100% rename from src/main/java/vgt_expansion/recipes/GTCXRecipeIterators.java rename to src/main/java/gtc_expansion/recipes/GTCXRecipeIterators.java diff --git a/src/main/java/vgt_expansion/recipes/GTCXRecipeLists.java b/src/main/java/gtc_expansion/recipes/GTCXRecipeLists.java similarity index 100% rename from src/main/java/vgt_expansion/recipes/GTCXRecipeLists.java rename to src/main/java/gtc_expansion/recipes/GTCXRecipeLists.java diff --git a/src/main/java/vgt_expansion/recipes/GTCXRecipeMods.java b/src/main/java/gtc_expansion/recipes/GTCXRecipeMods.java similarity index 100% rename from src/main/java/vgt_expansion/recipes/GTCXRecipeMods.java rename to src/main/java/gtc_expansion/recipes/GTCXRecipeMods.java diff --git a/src/main/java/vgt_expansion/recipes/GTCXRecipeProcessing.java b/src/main/java/gtc_expansion/recipes/GTCXRecipeProcessing.java similarity index 100% rename from src/main/java/vgt_expansion/recipes/GTCXRecipeProcessing.java rename to src/main/java/gtc_expansion/recipes/GTCXRecipeProcessing.java diff --git a/src/main/java/vgt_expansion/recipes/GTCXRecipeRemove.java b/src/main/java/gtc_expansion/recipes/GTCXRecipeRemove.java similarity index 100% rename from src/main/java/vgt_expansion/recipes/GTCXRecipeRemove.java rename to src/main/java/gtc_expansion/recipes/GTCXRecipeRemove.java diff --git a/src/main/java/vgt_expansion/render/GTCXGuiFirstLoad.java b/src/main/java/gtc_expansion/render/GTCXGuiFirstLoad.java similarity index 96% rename from src/main/java/vgt_expansion/render/GTCXGuiFirstLoad.java rename to src/main/java/gtc_expansion/render/GTCXGuiFirstLoad.java index d79cd8ed..01ce60da 100644 --- a/src/main/java/vgt_expansion/render/GTCXGuiFirstLoad.java +++ b/src/main/java/gtc_expansion/render/GTCXGuiFirstLoad.java @@ -49,7 +49,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { if(i == 6 || i == 8) y += 8; } - drawCenteredString(fontRenderer, "Trinsdar", x, y, 0xFFFFFF); + drawCenteredString(fontRenderer, "_MasterEnderman_", x, y, 0xFFFFFF); } @Override diff --git a/src/main/java/vgt_expansion/render/GTCXOverlay.java b/src/main/java/gtc_expansion/render/GTCXOverlay.java similarity index 100% rename from src/main/java/vgt_expansion/render/GTCXOverlay.java rename to src/main/java/gtc_expansion/render/GTCXOverlay.java diff --git a/src/main/java/vgt_expansion/render/GTCXRenderer.java b/src/main/java/gtc_expansion/render/GTCXRenderer.java similarity index 100% rename from src/main/java/vgt_expansion/render/GTCXRenderer.java rename to src/main/java/gtc_expansion/render/GTCXRenderer.java diff --git a/src/main/java/vgt_expansion/render/Matrix4.java b/src/main/java/gtc_expansion/render/Matrix4.java similarity index 100% rename from src/main/java/vgt_expansion/render/Matrix4.java rename to src/main/java/gtc_expansion/render/Matrix4.java diff --git a/src/main/java/vgt_expansion/render/Transformation.java b/src/main/java/gtc_expansion/render/Transformation.java similarity index 100% rename from src/main/java/vgt_expansion/render/Transformation.java rename to src/main/java/gtc_expansion/render/Transformation.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileAdvancedWorktable.java b/src/main/java/gtc_expansion/tile/GTCXTileAdvancedWorktable.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileAdvancedWorktable.java rename to src/main/java/gtc_expansion/tile/GTCXTileAdvancedWorktable.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileAlloyFurnace.java b/src/main/java/gtc_expansion/tile/GTCXTileAlloyFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileAlloyFurnace.java rename to src/main/java/gtc_expansion/tile/GTCXTileAlloyFurnace.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileAlloySmelter.java b/src/main/java/gtc_expansion/tile/GTCXTileAlloySmelter.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileAlloySmelter.java rename to src/main/java/gtc_expansion/tile/GTCXTileAlloySmelter.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileAssemblingMachine.java b/src/main/java/gtc_expansion/tile/GTCXTileAssemblingMachine.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileAssemblingMachine.java rename to src/main/java/gtc_expansion/tile/GTCXTileAssemblingMachine.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileBath.java b/src/main/java/gtc_expansion/tile/GTCXTileBath.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileBath.java rename to src/main/java/gtc_expansion/tile/GTCXTileBath.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileBrick.java b/src/main/java/gtc_expansion/tile/GTCXTileBrick.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileBrick.java rename to src/main/java/gtc_expansion/tile/GTCXTileBrick.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileCasing.java b/src/main/java/gtc_expansion/tile/GTCXTileCasing.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileCasing.java rename to src/main/java/gtc_expansion/tile/GTCXTileCasing.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileCentrifuge.java b/src/main/java/gtc_expansion/tile/GTCXTileCentrifuge.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileCentrifuge.java rename to src/main/java/gtc_expansion/tile/GTCXTileCentrifuge.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileChemicalReactor.java b/src/main/java/gtc_expansion/tile/GTCXTileChemicalReactor.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileChemicalReactor.java rename to src/main/java/gtc_expansion/tile/GTCXTileChemicalReactor.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileDieselGenerator.java b/src/main/java/gtc_expansion/tile/GTCXTileDieselGenerator.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileDieselGenerator.java rename to src/main/java/gtc_expansion/tile/GTCXTileDieselGenerator.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileDigitalTank.java b/src/main/java/gtc_expansion/tile/GTCXTileDigitalTank.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileDigitalTank.java rename to src/main/java/gtc_expansion/tile/GTCXTileDigitalTank.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileDustbin.java b/src/main/java/gtc_expansion/tile/GTCXTileDustbin.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileDustbin.java rename to src/main/java/gtc_expansion/tile/GTCXTileDustbin.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileElectricLocker.java b/src/main/java/gtc_expansion/tile/GTCXTileElectricLocker.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileElectricLocker.java rename to src/main/java/gtc_expansion/tile/GTCXTileElectricLocker.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileElectrolyzer.java b/src/main/java/gtc_expansion/tile/GTCXTileElectrolyzer.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileElectrolyzer.java rename to src/main/java/gtc_expansion/tile/GTCXTileElectrolyzer.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileExtruder.java b/src/main/java/gtc_expansion/tile/GTCXTileExtruder.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileExtruder.java rename to src/main/java/gtc_expansion/tile/GTCXTileExtruder.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileFluidCaster.java b/src/main/java/gtc_expansion/tile/GTCXTileFluidCaster.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileFluidCaster.java rename to src/main/java/gtc_expansion/tile/GTCXTileFluidCaster.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileFluidSmelter.java b/src/main/java/gtc_expansion/tile/GTCXTileFluidSmelter.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileFluidSmelter.java rename to src/main/java/gtc_expansion/tile/GTCXTileFluidSmelter.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileGasTurbine.java b/src/main/java/gtc_expansion/tile/GTCXTileGasTurbine.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileGasTurbine.java rename to src/main/java/gtc_expansion/tile/GTCXTileGasTurbine.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileLathe.java b/src/main/java/gtc_expansion/tile/GTCXTileLathe.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileLathe.java rename to src/main/java/gtc_expansion/tile/GTCXTileLathe.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileLocker.java b/src/main/java/gtc_expansion/tile/GTCXTileLocker.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileLocker.java rename to src/main/java/gtc_expansion/tile/GTCXTileLocker.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileMicrowave.java b/src/main/java/gtc_expansion/tile/GTCXTileMicrowave.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileMicrowave.java rename to src/main/java/gtc_expansion/tile/GTCXTileMicrowave.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTilePlateBender.java b/src/main/java/gtc_expansion/tile/GTCXTilePlateBender.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTilePlateBender.java rename to src/main/java/gtc_expansion/tile/GTCXTilePlateBender.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTilePlateCutter.java b/src/main/java/gtc_expansion/tile/GTCXTilePlateCutter.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTilePlateCutter.java rename to src/main/java/gtc_expansion/tile/GTCXTilePlateCutter.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileStoneCompressor.java b/src/main/java/gtc_expansion/tile/GTCXTileStoneCompressor.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileStoneCompressor.java rename to src/main/java/gtc_expansion/tile/GTCXTileStoneCompressor.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileStoneExtractor.java b/src/main/java/gtc_expansion/tile/GTCXTileStoneExtractor.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileStoneExtractor.java rename to src/main/java/gtc_expansion/tile/GTCXTileStoneExtractor.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileTrashBin.java b/src/main/java/gtc_expansion/tile/GTCXTileTrashBin.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileTrashBin.java rename to src/main/java/gtc_expansion/tile/GTCXTileTrashBin.java diff --git a/src/main/java/vgt_expansion/tile/GTCXTileWiremill.java b/src/main/java/gtc_expansion/tile/GTCXTileWiremill.java similarity index 100% rename from src/main/java/vgt_expansion/tile/GTCXTileWiremill.java rename to src/main/java/gtc_expansion/tile/GTCXTileWiremill.java diff --git a/src/main/java/vgt_expansion/tile/base/GTCXTileBaseBurnableFluidGenerator.java b/src/main/java/gtc_expansion/tile/base/GTCXTileBaseBurnableFluidGenerator.java similarity index 100% rename from src/main/java/vgt_expansion/tile/base/GTCXTileBaseBurnableFluidGenerator.java rename to src/main/java/gtc_expansion/tile/base/GTCXTileBaseBurnableFluidGenerator.java diff --git a/src/main/java/vgt_expansion/tile/base/GTCXTileBaseSteamMachine.java b/src/main/java/gtc_expansion/tile/base/GTCXTileBaseSteamMachine.java similarity index 100% rename from src/main/java/vgt_expansion/tile/base/GTCXTileBaseSteamMachine.java rename to src/main/java/gtc_expansion/tile/base/GTCXTileBaseSteamMachine.java diff --git a/src/main/java/vgt_expansion/tile/base/GTCXTileMultiBaseMachineAdv.java b/src/main/java/gtc_expansion/tile/base/GTCXTileMultiBaseMachineAdv.java similarity index 100% rename from src/main/java/vgt_expansion/tile/base/GTCXTileMultiBaseMachineAdv.java rename to src/main/java/gtc_expansion/tile/base/GTCXTileMultiBaseMachineAdv.java diff --git a/src/main/java/vgt_expansion/tile/hatch/GTCXTileEnergyOutputHatch.java b/src/main/java/gtc_expansion/tile/hatch/GTCXTileEnergyOutputHatch.java similarity index 100% rename from src/main/java/vgt_expansion/tile/hatch/GTCXTileEnergyOutputHatch.java rename to src/main/java/gtc_expansion/tile/hatch/GTCXTileEnergyOutputHatch.java diff --git a/src/main/java/vgt_expansion/tile/hatch/GTCXTileFusionEnergyInjector.java b/src/main/java/gtc_expansion/tile/hatch/GTCXTileFusionEnergyInjector.java similarity index 100% rename from src/main/java/vgt_expansion/tile/hatch/GTCXTileFusionEnergyInjector.java rename to src/main/java/gtc_expansion/tile/hatch/GTCXTileFusionEnergyInjector.java diff --git a/src/main/java/vgt_expansion/tile/hatch/GTCXTileItemFluidHatches.java b/src/main/java/gtc_expansion/tile/hatch/GTCXTileItemFluidHatches.java similarity index 100% rename from src/main/java/vgt_expansion/tile/hatch/GTCXTileItemFluidHatches.java rename to src/main/java/gtc_expansion/tile/hatch/GTCXTileItemFluidHatches.java diff --git a/src/main/java/vgt_expansion/tile/hatch/GTCXTileMachineControlHatch.java b/src/main/java/gtc_expansion/tile/hatch/GTCXTileMachineControlHatch.java similarity index 100% rename from src/main/java/vgt_expansion/tile/hatch/GTCXTileMachineControlHatch.java rename to src/main/java/gtc_expansion/tile/hatch/GTCXTileMachineControlHatch.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiCokeOven.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiCokeOven.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiCokeOven.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiCokeOven.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiDistillationTower.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiDistillationTower.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiDistillationTower.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiDistillationTower.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiFusionReactor.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiFusionReactor.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiFusionReactor.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiFusionReactor.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiImplosionCompressor.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiImplosionCompressor.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiImplosionCompressor.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiImplosionCompressor.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiIndustrialBlastFurnace.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiIndustrialBlastFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiIndustrialBlastFurnace.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiIndustrialBlastFurnace.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiIndustrialGrinder.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiIndustrialGrinder.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiIndustrialGrinder.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiIndustrialGrinder.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiIndustrialSawmill.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiIndustrialSawmill.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiIndustrialSawmill.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiIndustrialSawmill.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiLargeGasTurbine.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiLargeGasTurbine.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiLargeGasTurbine.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiLargeGasTurbine.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiLargeSteamTurbine.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiLargeSteamTurbine.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiLargeSteamTurbine.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiLargeSteamTurbine.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiPrimitiveBlastFurnace.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiPrimitiveBlastFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiPrimitiveBlastFurnace.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiPrimitiveBlastFurnace.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiThermalBoiler.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiThermalBoiler.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiThermalBoiler.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiThermalBoiler.java diff --git a/src/main/java/vgt_expansion/tile/multi/GTCXTileMultiVacuumFreezer.java b/src/main/java/gtc_expansion/tile/multi/GTCXTileMultiVacuumFreezer.java similarity index 100% rename from src/main/java/vgt_expansion/tile/multi/GTCXTileMultiVacuumFreezer.java rename to src/main/java/gtc_expansion/tile/multi/GTCXTileMultiVacuumFreezer.java diff --git a/src/main/java/vgt_expansion/tile/overrides/GTCXTileScanner.java b/src/main/java/gtc_expansion/tile/overrides/GTCXTileScanner.java similarity index 100% rename from src/main/java/vgt_expansion/tile/overrides/GTCXTileScanner.java rename to src/main/java/gtc_expansion/tile/overrides/GTCXTileScanner.java diff --git a/src/main/java/vgt_expansion/tile/pipes/GTCXTileBaseFluidPipe.java b/src/main/java/gtc_expansion/tile/pipes/GTCXTileBaseFluidPipe.java similarity index 100% rename from src/main/java/vgt_expansion/tile/pipes/GTCXTileBaseFluidPipe.java rename to src/main/java/gtc_expansion/tile/pipes/GTCXTileBaseFluidPipe.java diff --git a/src/main/java/vgt_expansion/tile/pipes/GTCXTileBaseItemPipe.java b/src/main/java/gtc_expansion/tile/pipes/GTCXTileBaseItemPipe.java similarity index 100% rename from src/main/java/vgt_expansion/tile/pipes/GTCXTileBaseItemPipe.java rename to src/main/java/gtc_expansion/tile/pipes/GTCXTileBaseItemPipe.java diff --git a/src/main/java/vgt_expansion/tile/pipes/GTCXTileBasePipe.java b/src/main/java/gtc_expansion/tile/pipes/GTCXTileBasePipe.java similarity index 100% rename from src/main/java/vgt_expansion/tile/pipes/GTCXTileBasePipe.java rename to src/main/java/gtc_expansion/tile/pipes/GTCXTileBasePipe.java diff --git a/src/main/java/vgt_expansion/tile/pipes/GTCXTileQuadFluidPipe.java b/src/main/java/gtc_expansion/tile/pipes/GTCXTileQuadFluidPipe.java similarity index 100% rename from src/main/java/vgt_expansion/tile/pipes/GTCXTileQuadFluidPipe.java rename to src/main/java/gtc_expansion/tile/pipes/GTCXTileQuadFluidPipe.java diff --git a/src/main/java/vgt_expansion/tile/steam/GTCXTileCoalBoiler.java b/src/main/java/gtc_expansion/tile/steam/GTCXTileCoalBoiler.java similarity index 100% rename from src/main/java/vgt_expansion/tile/steam/GTCXTileCoalBoiler.java rename to src/main/java/gtc_expansion/tile/steam/GTCXTileCoalBoiler.java diff --git a/src/main/java/vgt_expansion/tile/steam/GTCXTileSteamAlloySmelter.java b/src/main/java/gtc_expansion/tile/steam/GTCXTileSteamAlloySmelter.java similarity index 100% rename from src/main/java/vgt_expansion/tile/steam/GTCXTileSteamAlloySmelter.java rename to src/main/java/gtc_expansion/tile/steam/GTCXTileSteamAlloySmelter.java diff --git a/src/main/java/vgt_expansion/tile/steam/GTCXTileSteamCompressor.java b/src/main/java/gtc_expansion/tile/steam/GTCXTileSteamCompressor.java similarity index 100% rename from src/main/java/vgt_expansion/tile/steam/GTCXTileSteamCompressor.java rename to src/main/java/gtc_expansion/tile/steam/GTCXTileSteamCompressor.java diff --git a/src/main/java/vgt_expansion/tile/steam/GTCXTileSteamExtractor.java b/src/main/java/gtc_expansion/tile/steam/GTCXTileSteamExtractor.java similarity index 100% rename from src/main/java/vgt_expansion/tile/steam/GTCXTileSteamExtractor.java rename to src/main/java/gtc_expansion/tile/steam/GTCXTileSteamExtractor.java diff --git a/src/main/java/vgt_expansion/tile/steam/GTCXTileSteamForgeHammer.java b/src/main/java/gtc_expansion/tile/steam/GTCXTileSteamForgeHammer.java similarity index 100% rename from src/main/java/vgt_expansion/tile/steam/GTCXTileSteamForgeHammer.java rename to src/main/java/gtc_expansion/tile/steam/GTCXTileSteamForgeHammer.java diff --git a/src/main/java/vgt_expansion/tile/steam/GTCXTileSteamFurnace.java b/src/main/java/gtc_expansion/tile/steam/GTCXTileSteamFurnace.java similarity index 100% rename from src/main/java/vgt_expansion/tile/steam/GTCXTileSteamFurnace.java rename to src/main/java/gtc_expansion/tile/steam/GTCXTileSteamFurnace.java diff --git a/src/main/java/vgt_expansion/tile/steam/GTCXTileSteamMacerator.java b/src/main/java/gtc_expansion/tile/steam/GTCXTileSteamMacerator.java similarity index 100% rename from src/main/java/vgt_expansion/tile/steam/GTCXTileSteamMacerator.java rename to src/main/java/gtc_expansion/tile/steam/GTCXTileSteamMacerator.java diff --git a/src/main/java/vgt_expansion/tile/wiring/GTCXTileAluminiumCable.java b/src/main/java/gtc_expansion/tile/wiring/GTCXTileAluminiumCable.java similarity index 100% rename from src/main/java/vgt_expansion/tile/wiring/GTCXTileAluminiumCable.java rename to src/main/java/gtc_expansion/tile/wiring/GTCXTileAluminiumCable.java diff --git a/src/main/java/vgt_expansion/tile/wiring/GTCXTileColoredCable.java b/src/main/java/gtc_expansion/tile/wiring/GTCXTileColoredCable.java similarity index 100% rename from src/main/java/vgt_expansion/tile/wiring/GTCXTileColoredCable.java rename to src/main/java/gtc_expansion/tile/wiring/GTCXTileColoredCable.java diff --git a/src/main/java/vgt_expansion/tile/wiring/GTCXTileElectrumCable.java b/src/main/java/gtc_expansion/tile/wiring/GTCXTileElectrumCable.java similarity index 100% rename from src/main/java/vgt_expansion/tile/wiring/GTCXTileElectrumCable.java rename to src/main/java/gtc_expansion/tile/wiring/GTCXTileElectrumCable.java diff --git a/src/main/java/vgt_expansion/util/CoverStorage.java b/src/main/java/gtc_expansion/util/CoverStorage.java similarity index 100% rename from src/main/java/vgt_expansion/util/CoverStorage.java rename to src/main/java/gtc_expansion/util/CoverStorage.java diff --git a/src/main/java/vgt_expansion/util/EnergyConsumer.java b/src/main/java/gtc_expansion/util/EnergyConsumer.java similarity index 100% rename from src/main/java/vgt_expansion/util/EnergyConsumer.java rename to src/main/java/gtc_expansion/util/EnergyConsumer.java diff --git a/src/main/java/vgt_expansion/util/GTCXBatteryInput.java b/src/main/java/gtc_expansion/util/GTCXBatteryInput.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXBatteryInput.java rename to src/main/java/gtc_expansion/util/GTCXBatteryInput.java diff --git a/src/main/java/vgt_expansion/util/GTCXBedrockOreHandler.java b/src/main/java/gtc_expansion/util/GTCXBedrockOreHandler.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXBedrockOreHandler.java rename to src/main/java/gtc_expansion/util/GTCXBedrockOreHandler.java diff --git a/src/main/java/vgt_expansion/util/GTCXBetterPipesCompat.java b/src/main/java/gtc_expansion/util/GTCXBetterPipesCompat.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXBetterPipesCompat.java rename to src/main/java/gtc_expansion/util/GTCXBetterPipesCompat.java diff --git a/src/main/java/vgt_expansion/util/GTCXCropHandler.java b/src/main/java/gtc_expansion/util/GTCXCropHandler.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXCropHandler.java rename to src/main/java/gtc_expansion/util/GTCXCropHandler.java diff --git a/src/main/java/vgt_expansion/util/GTCXDustbinFilter.java b/src/main/java/gtc_expansion/util/GTCXDustbinFilter.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXDustbinFilter.java rename to src/main/java/gtc_expansion/util/GTCXDustbinFilter.java diff --git a/src/main/java/vgt_expansion/util/GTCXHelperPipe.java b/src/main/java/gtc_expansion/util/GTCXHelperPipe.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXHelperPipe.java rename to src/main/java/gtc_expansion/util/GTCXHelperPipe.java diff --git a/src/main/java/vgt_expansion/util/GTCXIc2cECompat.java b/src/main/java/gtc_expansion/util/GTCXIc2cECompat.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXIc2cECompat.java rename to src/main/java/gtc_expansion/util/GTCXIc2cECompat.java diff --git a/src/main/java/vgt_expansion/util/GTCXMaterialWrench.java b/src/main/java/gtc_expansion/util/GTCXMaterialWrench.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXMaterialWrench.java rename to src/main/java/gtc_expansion/util/GTCXMaterialWrench.java diff --git a/src/main/java/vgt_expansion/util/GTCXPassiveMachineFilter.java b/src/main/java/gtc_expansion/util/GTCXPassiveMachineFilter.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXPassiveMachineFilter.java rename to src/main/java/gtc_expansion/util/GTCXPassiveMachineFilter.java diff --git a/src/main/java/vgt_expansion/util/GTCXRecipeInputIngredient.java b/src/main/java/gtc_expansion/util/GTCXRecipeInputIngredient.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXRecipeInputIngredient.java rename to src/main/java/gtc_expansion/util/GTCXRecipeInputIngredient.java diff --git a/src/main/java/vgt_expansion/util/GTCXScannerFilter.java b/src/main/java/gtc_expansion/util/GTCXScannerFilter.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXScannerFilter.java rename to src/main/java/gtc_expansion/util/GTCXScannerFilter.java diff --git a/src/main/java/vgt_expansion/util/GTCXSteamMachineFilter.java b/src/main/java/gtc_expansion/util/GTCXSteamMachineFilter.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXSteamMachineFilter.java rename to src/main/java/gtc_expansion/util/GTCXSteamMachineFilter.java diff --git a/src/main/java/vgt_expansion/util/GTCXTank.java b/src/main/java/gtc_expansion/util/GTCXTank.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXTank.java rename to src/main/java/gtc_expansion/util/GTCXTank.java diff --git a/src/main/java/vgt_expansion/util/GTCXWrenchUtils.java b/src/main/java/gtc_expansion/util/GTCXWrenchUtils.java similarity index 100% rename from src/main/java/vgt_expansion/util/GTCXWrenchUtils.java rename to src/main/java/gtc_expansion/util/GTCXWrenchUtils.java diff --git a/src/main/java/vgt_expansion/util/MultiBlockHelper.java b/src/main/java/gtc_expansion/util/MultiBlockHelper.java similarity index 100% rename from src/main/java/vgt_expansion/util/MultiBlockHelper.java rename to src/main/java/gtc_expansion/util/MultiBlockHelper.java diff --git a/src/main/java/vgt_expansion/util/RotationHelper.java b/src/main/java/gtc_expansion/util/RotationHelper.java similarity index 100% rename from src/main/java/vgt_expansion/util/RotationHelper.java rename to src/main/java/gtc_expansion/util/RotationHelper.java diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b72b47a177eea488a8e7983a26d48e1a798dccfe GIT binary patch literal 2781 zcmcgu2~ZSg7Jl8d&=X)7hI2XGLAgc_CjttB$jCjM0!hFKj#wNn#BhlOW$h@k9A@zX zi6CI2q(o&vB0)u*6(*Qc0fPn!NPvo%1Q^cM;oiTQV$0pCRPAb#se1KK|F8b{zW?j* zz1KN`{+_CD>AeL2s@`61K>#@Vivy{EmZl2hy8zgs-L9^I-mb2kz@!hOcgIHon70)i z_c3?dYVh?z#fP>*zQ--4xP`#0P{oe>7rj%RcW&)l`KZUSjd2V6Q5kssySY@c-_YCq~5bfKhMpyPB*qrGYO_m#k23G4n;jbn`ZmjgVqOed)E@X z&*iWV-}rgZBeI6E=I?Eem5|g*LO-@IFzqzYE3y1VsCl*!o4TvyOO(VGLSgsz_ArOU^R0`f1{nOi4z<%f)YHN8+&uabC0n7iw! zrS^?c&-s6h?s*z=aEB3B^W*Ph+V+oT-uOV)JJBFo-8So-^@~~kmp%)_Mk*QEjqiNB zky)Oo&?*v~sZr1=Zl5XYFnoHtGD-DtIch)dG%>5Z!)PSb?rBi=%ug&eM8*Qy0{3@%=gcEo}HRvqQ^5MI@V}W zObPN2UZj6ed;9!tw8Kd73QGoH-k}ZCG8a$)`%rLp-TwYXt zy=zuOJV3M?Q3jZ$KN#Y7)qn5Dl6i$Ru4%mW`bjrmukW29={KYO*WOwNk17o{;wBb} zBzt=bndLDdP}4TjJW*Tmw8I&ji}Ar(Viqz3yvPS|-7SC@xk56-1zbrNNG65W7%3!? zF|qq5fTwJK9Cs*Yi}}FCpPT}wCyamO6y6~1AQEH;VR2pyCvll2WGQrOlsg^nBF(7*!F&92 z#W5|>epXZX+w**teTE&oW@|ITAxyNEXPRS9C7SYwta&d(KhR~Ldk%cJG!(+)l zE_T!u1w&5St%^CBP!9=S0dkVaU2a5uLGaEXY{~BPdqP&r|7a3Ud)Q$~l8S)Dt^?1{;Jk-U;bh6J$A)CI(R)Uv9GiQz$xzSW< zV!o@;b$EhXkUpRqhI{4QOS7t)Vov`Y!kYK?m?H5kp{(~oLX%m^S?DoAikZ{K zY@M}S-u*8yF$Kz;p}p|-&UM(A%i=>3{P46q*tR5`E*RJ)%_&0N<-0uyw-TOqa#?74 zIMUu`MxWoZ!Vu}E*qkwiWa|#Jb`ep<#MnvbHC`5N7Sgde;EjS*N5F04h?ktKn~^hz zb)_3CT3*yPno*JRGFdOLgjWR0Dr-T7`GLGJ;}#)3Rh3h?xfrx*juV!&XpY;{;zJyl z%m`sq&7I2wSo6+CZB+OhsnTJ_oJOS*tHq&2-W*sI46?-AU+p+e{v7`ln^$-Kw;ogz z0L8h_Vy@`B3{PHrf-UzqHO{+tJ>O({{aPFSkC@%glq@PHpgHq_B)T-4;f;D&{{As5 ztT}Zh*|*~l7$dLDt44c@Kai*vDa%OQ;yqsdQj)r|IboZVv@QiM%})JL{rEQ=s{hAK to?QUNoR*BUA~iI|U;mRrFgyADV20h1HOIF*C!#MN@OJlitJ)$w^e<0K<9Pr8 literal 0 HcmV?d00001 diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 7ca67818..af5ea45c 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,16 +1,19 @@ [ -{ - "modid": "gtc_expansion", - "name": "GTC Expansion", - "description": "An addon to GT Classic implementing gt4 features", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "", - "updateUrl": "", - "authorList": ["trinsdar"], - "credits": "e99999, muramasa, speiger for making ic2 classic, Gregorious T for making GT", - "logoFile": "", - "screenshots": [], - "dependencies": [] -} + { + "modid": "gtc_expansion", + "name": "VGT Expansion", + "description": "An addon to Vintage GregTech implementing various GT4 features", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://github.com/Ender-Development/VGT-Expansion", + "updateUrl": "", + "authorList": [ + "trinsdar", + "Ender-Development" + ], + "credits": "e99999, muramasa, speiger for making ic2 classic, Gregorious T for making GT", + "logoFile": "icon.png", + "screenshots": [], + "dependencies": [] + } ]