From a93361792fc64ff814f6af4c9224ade643e7d609 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 21 Feb 2019 17:55:17 +0000 Subject: [PATCH] fix ConfigRegistry location, 1118 errors --- src/main/java/techreborn/blocks/BlockOre.java | 2 +- src/main/java/techreborn/blocks/OreBlockStateManager.java | 2 +- src/main/java/techreborn/blocks/cable/BlockCable.java | 2 +- src/main/java/techreborn/config/ConfigTechReborn.java | 2 +- src/main/java/techreborn/entities/EntityNukePrimed.java | 2 +- src/main/java/techreborn/events/BlockBreakHandler.java | 3 ++- src/main/java/techreborn/init/TRContent.java | 2 +- .../java/techreborn/init/recipes/IndustrialSawmillRecipes.java | 2 +- src/main/java/techreborn/tiles/TileChargeOMat.java | 2 +- src/main/java/techreborn/tiles/TileChunkLoader.java | 2 +- src/main/java/techreborn/tiles/TileDigitalChest.java | 2 +- src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java | 2 +- src/main/java/techreborn/tiles/TileMatterFabricator.java | 2 +- src/main/java/techreborn/tiles/TilePump.java | 2 +- src/main/java/techreborn/tiles/TileQuantumChest.java | 2 +- src/main/java/techreborn/tiles/TileQuantumTank.java | 2 +- .../tiles/fusionReactor/TileFusionControlComputer.java | 2 +- src/main/java/techreborn/tiles/generator/TileLightningRod.java | 2 +- .../java/techreborn/tiles/generator/TilePlasmaGenerator.java | 2 +- .../tiles/generator/advanced/TileDieselGenerator.java | 2 +- .../tiles/generator/advanced/TileDragonEggSyphon.java | 2 +- .../techreborn/tiles/generator/advanced/TileGasTurbine.java | 2 +- .../tiles/generator/advanced/TileSemiFluidGenerator.java | 2 +- .../tiles/generator/advanced/TileThermalGenerator.java | 2 +- .../tiles/generator/basic/TileSolidFuelGenerator.java | 2 +- .../java/techreborn/tiles/generator/basic/TileWaterMill.java | 2 +- .../java/techreborn/tiles/generator/basic/TileWindMill.java | 2 +- .../tiles/machine/multiblock/TileDistillationTower.java | 2 +- .../tiles/machine/multiblock/TileFluidReplicator.java | 2 +- .../tiles/machine/multiblock/TileImplosionCompressor.java | 2 +- .../tiles/machine/multiblock/TileIndustrialBlastFurnace.java | 2 +- .../tiles/machine/multiblock/TileIndustrialGrinder.java | 2 +- .../tiles/machine/multiblock/TileIndustrialSawmill.java | 2 +- .../techreborn/tiles/machine/multiblock/TileVacuumFreezer.java | 2 +- .../java/techreborn/tiles/machine/tier1/TileAlloySmelter.java | 2 +- .../techreborn/tiles/machine/tier1/TileAssemblingMachine.java | 2 +- .../techreborn/tiles/machine/tier1/TileAutoCraftingTable.java | 2 +- .../techreborn/tiles/machine/tier1/TileChemicalReactor.java | 2 +- .../java/techreborn/tiles/machine/tier1/TileCompressor.java | 2 +- .../techreborn/tiles/machine/tier1/TileElectricFurnace.java | 2 +- .../java/techreborn/tiles/machine/tier1/TileExtractor.java | 2 +- src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java | 2 +- .../tiles/machine/tier1/TileIndustrialElectrolyzer.java | 2 +- .../techreborn/tiles/machine/tier1/TilePlayerDectector.java | 2 +- src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java | 2 +- .../techreborn/tiles/machine/tier1/TileRollingMachine.java | 2 +- .../techreborn/tiles/machine/tier1/TileScrapboxinator.java | 2 +- src/main/java/techreborn/tiles/storage/TileAdjustableSU.java | 2 +- .../techreborn/tiles/storage/idsu/TileInterdimensionalSU.java | 2 +- .../java/techreborn/tiles/storage/lesu/TileLapotronicSU.java | 2 +- .../java/techreborn/tiles/transformers/TileTransformer.java | 2 +- src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java | 2 +- src/main/java/techreborn/world/OilLakeGenerator.java | 2 +- 53 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 7b55dde4f..ba1d93d9e 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.OreDrop; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/blocks/OreBlockStateManager.java b/src/main/java/techreborn/blocks/OreBlockStateManager.java index 6e9026d41..48dbd32d6 100644 --- a/src/main/java/techreborn/blocks/OreBlockStateManager.java +++ b/src/main/java/techreborn/blocks/OreBlockStateManager.java @@ -25,7 +25,7 @@ package techreborn.blocks; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; //This is in its own class as not to load the block class before diff --git a/src/main/java/techreborn/blocks/cable/BlockCable.java b/src/main/java/techreborn/blocks/cable/BlockCable.java index ebad03d05..a816f4bbe 100644 --- a/src/main/java/techreborn/blocks/cable/BlockCable.java +++ b/src/main/java/techreborn/blocks/cable/BlockCable.java @@ -49,7 +49,7 @@ import reborncore.api.ToolManager; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.init.ModSounds; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index d39ef70c2..032ef6691 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -25,7 +25,7 @@ package techreborn.config; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/entities/EntityNukePrimed.java b/src/main/java/techreborn/entities/EntityNukePrimed.java index 9f4d795eb..187afcef6 100644 --- a/src/main/java/techreborn/entities/EntityNukePrimed.java +++ b/src/main/java/techreborn/entities/EntityNukePrimed.java @@ -32,7 +32,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.common.explosion.RebornExplosion; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; /** diff --git a/src/main/java/techreborn/events/BlockBreakHandler.java b/src/main/java/techreborn/events/BlockBreakHandler.java index f70552a8a..b115d37c7 100644 --- a/src/main/java/techreborn/events/BlockBreakHandler.java +++ b/src/main/java/techreborn/events/BlockBreakHandler.java @@ -36,7 +36,8 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; + +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.OreDrop; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 47e3b2d3b..7007e164b 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -8,7 +8,7 @@ import reborncore.api.power.EnumPowerTier; import reborncore.api.tile.IUpgrade; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.blocks.*; import techreborn.blocks.cable.BlockCable; diff --git a/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java index 0c1b7fc89..1ae52fa74 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java @@ -36,7 +36,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import reborncore.api.recipe.RecipeHandler; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index 7c789a16c..b8b06969e 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -32,7 +32,7 @@ import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index e85b461ee..4e3e02afa 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -31,7 +31,7 @@ import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 9e93fcb1d..479d4c6e3 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -26,7 +26,7 @@ package techreborn.tiles; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; diff --git a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java index 373460441..82d83a52b 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import reborncore.api.IListInfoProvider; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 8ecfa8809..d65ee5831 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -31,7 +31,7 @@ import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/tiles/TilePump.java b/src/main/java/techreborn/tiles/TilePump.java index 62bde40b9..22c332631 100644 --- a/src/main/java/techreborn/tiles/TilePump.java +++ b/src/main/java/techreborn/tiles/TilePump.java @@ -39,7 +39,7 @@ import net.minecraftforge.fluids.IFluidBlock; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Tank; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index bc4bab016..06f726e61 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -26,7 +26,7 @@ package techreborn.tiles; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 57754b5f7..22ce2b4a9 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -33,7 +33,7 @@ import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index 0a36e55a2..92219a28a 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -34,7 +34,7 @@ import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.RebornCoreConfig; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import reborncore.common.util.Torus; diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index 9e3f7a975..c4bd0e938 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -35,7 +35,7 @@ import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java index 5b9f6cd7d..bec5b9323 100644 --- a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java @@ -27,7 +27,7 @@ package techreborn.tiles.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java index f8c972770..538e805e7 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java @@ -27,7 +27,7 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java index d3e9206f8..a0a28f4ab 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDragonEggSyphon.java @@ -34,7 +34,7 @@ import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java index 5c350ec07..4a5a98f34 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java @@ -27,7 +27,7 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java index 73329d1f7..4d10c9bd5 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java @@ -27,7 +27,7 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java index 13c0e8674..92d700418 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java @@ -27,7 +27,7 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java index c0b062d1d..3a9b320da 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java @@ -36,7 +36,7 @@ import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; diff --git a/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java index 84caceb45..cc3f50c78 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileWaterMill.java @@ -31,7 +31,7 @@ import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.blocks.generator.BlockWindMill; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java b/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java index 8b173186c..1b4f06e96 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileWindMill.java @@ -30,7 +30,7 @@ import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java b/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java index 286e8619b..3a8ab481a 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java @@ -29,7 +29,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java index 93add11f9..8aacc8e7f 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java @@ -29,7 +29,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.FluidUtils; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java index 7a7de81c6..b9ff815c5 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java index 802580c76..c9f6bbe46 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java @@ -34,7 +34,7 @@ import net.minecraft.util.math.BlockPos; import reborncore.common.multiblock.IMultiblockPart; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java index 065d0aac3..685e26aea 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java @@ -36,7 +36,7 @@ import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.FluidUtils; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java index d581581fa..3794535df 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java @@ -36,7 +36,7 @@ import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.FluidUtils; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java index 8f074922e..e68a27906 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java @@ -27,7 +27,7 @@ package techreborn.tiles.machine.multiblock; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java b/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java index 4424dc2d0..358084f8c 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java @@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer; import reborncore.api.recipe.RecipeHandler; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java index 2fe0db576..dcbf34592 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java @@ -27,7 +27,7 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java index 03afbf961..d04b10abb 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java @@ -40,7 +40,7 @@ import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java b/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java index bfcf8f7cf..0b5356ac6 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java @@ -27,7 +27,7 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java b/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java index 170e9db4b..45a9ddba6 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java @@ -27,7 +27,7 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java index 1cafd1b9c..19e7e1c20 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java @@ -34,7 +34,7 @@ import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java b/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java index 04504ee2b..dcb1370f9 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java @@ -27,7 +27,7 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java index 3b91ae489..969934d16 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java @@ -27,7 +27,7 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java index 3cad8a621..ef36681c7 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java @@ -27,7 +27,7 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java index 7b0dbe46f..5589005cb 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java @@ -32,7 +32,7 @@ import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.WorldUtils; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java index 8666d5407..5ad88af51 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java @@ -33,7 +33,7 @@ import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java index dd5fd0824..26c9cdb53 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java @@ -37,7 +37,7 @@ import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java index 856125457..134a59c9d 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java @@ -26,7 +26,7 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.recipe.ScrapboxRecipeCrafter; diff --git a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java index c92309271..2efc31699 100644 --- a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java +++ b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import reborncore.api.power.EnumPowerTier; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; diff --git a/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java b/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java index ce0e9760e..93ee9a6ad 100644 --- a/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java +++ b/src/main/java/techreborn/tiles/storage/idsu/TileInterdimensionalSU.java @@ -32,7 +32,7 @@ import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.init.TRContent; import techreborn.tiles.storage.TileEnergyStorage; diff --git a/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java b/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java index aeb15eada..cb90ab0e3 100644 --- a/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java +++ b/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java @@ -34,7 +34,7 @@ import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.RebornCoreConfig; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.blocks.storage.BlockLapotronicSU; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/transformers/TileTransformer.java b/src/main/java/techreborn/tiles/transformers/TileTransformer.java index 3cc2d7632..b4e8c3455 100644 --- a/src/main/java/techreborn/tiles/transformers/TileTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileTransformer.java @@ -35,7 +35,7 @@ import reborncore.api.power.EnumPowerTier; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.StringUtils; import techreborn.TechReborn; import techreborn.blocks.transformers.BlockTransformer; diff --git a/src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java b/src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java index 8d9e54583..91a23c7e2 100644 --- a/src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java +++ b/src/main/java/techreborn/utils/BehaviorDispenseScrapbox.java @@ -35,7 +35,7 @@ import net.minecraft.util.math.BlockPos; import reborncore.api.recipe.IBaseRecipeType; import reborncore.api.recipe.RecipeHandler; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/world/OilLakeGenerator.java b/src/main/java/techreborn/world/OilLakeGenerator.java index 44594c3b2..a1b7939b6 100644 --- a/src/main/java/techreborn/world/OilLakeGenerator.java +++ b/src/main/java/techreborn/world/OilLakeGenerator.java @@ -31,7 +31,7 @@ import net.minecraft.world.gen.IChunkGenerator; import net.minecraft.world.gen.feature.WorldGenLakes; import net.minecraftforge.fml.common.IWorldGenerator; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.init.ModFluids;