diff --git a/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java b/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java index afdc17f67..01ebb9e60 100644 --- a/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java +++ b/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java @@ -24,11 +24,6 @@ package techreborn.api.fluidreplicator; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.Fluid; @@ -36,6 +31,10 @@ import net.minecraftforge.fluids.FluidRegistry; import techreborn.init.ModItems; import techreborn.tiles.multiblock.TileFluidReplicator; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + /** * @author drcrazy * diff --git a/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipeList.java b/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipeList.java index 33f03fba1..a8819515c 100644 --- a/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipeList.java +++ b/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipeList.java @@ -24,12 +24,11 @@ package techreborn.api.fluidreplicator; -import java.util.ArrayList; -import java.util.Optional; - +import net.minecraftforge.fluids.Fluid; import org.apache.commons.lang3.Validate; -import net.minecraftforge.fluids.Fluid; +import java.util.ArrayList; +import java.util.Optional; /** * @author drcrazy diff --git a/src/main/java/techreborn/api/generator/package-info.java b/src/main/java/techreborn/api/generator/package-info.java deleted file mode 100644 index d37e34ad4..000000000 --- a/src/main/java/techreborn/api/generator/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") -package techreborn.api.generator; - -import net.minecraftforge.fml.common.API; diff --git a/src/main/java/techreborn/api/package-info.java b/src/main/java/techreborn/api/package-info.java deleted file mode 100644 index f55962f9c..000000000 --- a/src/main/java/techreborn/api/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") -package techreborn.api; - -import net.minecraftforge.fml.common.API; diff --git a/src/main/java/techreborn/api/reactor/package-info.java b/src/main/java/techreborn/api/reactor/package-info.java deleted file mode 100644 index b22349d4c..000000000 --- a/src/main/java/techreborn/api/reactor/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") -package techreborn.api.reactor; - -import net.minecraftforge.fml.common.API; diff --git a/src/main/java/techreborn/api/recipe/machines/package-info.java b/src/main/java/techreborn/api/recipe/machines/package-info.java deleted file mode 100644 index def86f6ca..000000000 --- a/src/main/java/techreborn/api/recipe/machines/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") -package techreborn.api.recipe.machines; - -import net.minecraftforge.fml.common.API; diff --git a/src/main/java/techreborn/api/recipe/package-info.java b/src/main/java/techreborn/api/recipe/package-info.java deleted file mode 100644 index 005bd549c..000000000 --- a/src/main/java/techreborn/api/recipe/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -@API(apiVersion = "@MODVERSION@", owner = "techreborn", provides = "techrebornAPI") -package techreborn.api.recipe; - -import net.minecraftforge.fml.common.API; diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index 7752e2c27..e893772f5 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -43,9 +43,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.items.WrenchHelper; @@ -67,7 +67,7 @@ public class BlockAlarm extends BaseTileBlock { this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false)); this.bbs = GenBoundingBoxes(0.19, 0.81); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 03f574eb7..4302d9ad6 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -33,15 +33,15 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.init.ModSounds; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; public class BlockComputerCube extends BlockMachineBase { @@ -49,7 +49,7 @@ public class BlockComputerCube extends BlockMachineBase { super(); this.setUnlocalizedName("techreborn.computercube"); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/BlockFlare.java b/src/main/java/techreborn/blocks/BlockFlare.java index cef52eb09..0cbf702d3 100644 --- a/src/main/java/techreborn/blocks/BlockFlare.java +++ b/src/main/java/techreborn/blocks/BlockFlare.java @@ -41,8 +41,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import techreborn.utils.TechRebornCreativeTab; import techreborn.tiles.TileEntityFlare; +import techreborn.utils.TechRebornCreativeTab; import java.util.List; diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index a03838ac2..97909a932 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -39,13 +39,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; -import techreborn.utils.TechRebornCreativeTab; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import techreborn.init.ModBlocks; import techreborn.init.ModSounds; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; import java.util.List; @@ -57,7 +57,7 @@ public class BlockFusionCoil extends Block { setHardness(2f); setSoundType(SoundType.METAL); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 39ffc83dd..fd14b0752 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -33,16 +33,16 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.Torus; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; import techreborn.tiles.fusionReactor.TileFusionControlComputer; +import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.damageSources.FusionDamageSource; import java.util.List; @@ -52,7 +52,7 @@ public class BlockFusionControlComputer extends BlockMachineBase { public BlockFusionControlComputer() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 5b9a136f2..17f8afa53 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -42,19 +42,19 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.RebornCoreConfig; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.PropertyString; import reborncore.common.items.WrenchHelper; import reborncore.common.multiblock.BlockMultiblockBase; import reborncore.common.util.ArrayUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; import techreborn.tiles.TileMachineCasing; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; import java.util.List; @@ -72,7 +72,7 @@ public class BlockMachineCasing extends BlockMultiblockBase { setHardness(2F); this.setDefaultState(this.getDefaultState().withProperty(TYPE, "standard")); for (int i = 0; i < types.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant("type=" + types[i])); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant("type=" + types[i])); } BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/BlockMachineFrames.java b/src/main/java/techreborn/blocks/BlockMachineFrames.java index 7d4d7d654..8928b25eb 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrames.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrames.java @@ -34,14 +34,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseBlock; import reborncore.common.blocks.PropertyString; import reborncore.common.util.ArrayUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; import java.util.List; @@ -57,7 +57,7 @@ public class BlockMachineFrames extends BaseBlock { setHardness(1f); this.setDefaultState(this.getDefaultState().withProperty(TYPE, "basic")); for (int i = 0; i < types.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant("type=" + types[i])); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/structure").setInvVariant("type=" + types[i])); } } diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index 6cfe59809..4e53cdc48 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -38,12 +38,12 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseBlock; -import techreborn.utils.TechRebornCreativeTab; import techreborn.entities.EntityNukePrimed; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; /** * Created by Mark on 13/03/2016. @@ -56,7 +56,7 @@ public class BlockNuke extends BaseBlock { setUnlocalizedName("techreborn.nuke"); setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false)); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } public void explode(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase igniter) { diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index f0af9993c..e250d5542 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -40,20 +40,20 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.PropertyString; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.ArrayUtils; import reborncore.common.util.OreDrop; import reborncore.common.util.StringUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModBlocks; import techreborn.items.ItemDusts; import techreborn.items.ItemGems; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import techreborn.world.config.IOreNameProvider; import java.util.List; @@ -101,7 +101,7 @@ public class BlockOre extends Block implements IOreNameProvider { setHarvestLevel("pickaxe", 2); this.setDefaultState(this.getStateFromMeta(0)); for (int i = 0; i < ores.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + OreBlockStateManager.convert(ores[i])).setFileName("ores")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + OreBlockStateManager.convert(ores[i])).setFileName("ores")); } TRRecipeHandler.hideEntry(this); } diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index a886ce717..80207c99e 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -38,15 +38,15 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.PropertyString; import reborncore.common.util.ArrayUtils; import reborncore.common.util.StringUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import techreborn.world.config.IOreNameProvider; import java.security.InvalidParameterException; @@ -65,7 +65,7 @@ public class BlockOre2 extends Block implements IOreNameProvider { setHarvestLevel("pickaxe", 1); this.setDefaultState(this.getStateFromMeta(0)); for (int i = 0; i < ores.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + ores[i]).setFileName("ores")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + ores[i]).setFileName("ores")); } TRRecipeHandler.hideEntry(this); } diff --git a/src/main/java/techreborn/blocks/BlockRefinedIronFence.java b/src/main/java/techreborn/blocks/BlockRefinedIronFence.java index c4703b1e1..830f6bec2 100644 --- a/src/main/java/techreborn/blocks/BlockRefinedIronFence.java +++ b/src/main/java/techreborn/blocks/BlockRefinedIronFence.java @@ -36,7 +36,7 @@ public class BlockRefinedIronFence extends BlockFence { setCreativeTab(TechRebornCreativeTab.instance); setHardness(2.0F); setHarvestLevel("pickaxe", 2); - //ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + //RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java index 6094d6df9..df380eeb3 100644 --- a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java +++ b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java @@ -31,10 +31,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; -import techreborn.utils.TechRebornCreativeTab; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import java.util.Random; @@ -46,7 +46,7 @@ public class BlockReinforcedGlass extends BlockGlass { setSoundType(SoundType.STONE); setHardness(4.0F); setResistance(60F); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 4bb4a69a7..488333691 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -38,12 +38,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import techreborn.Core; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import java.util.List; import java.util.Random; @@ -56,7 +56,7 @@ public class BlockRubberLeaves extends BlockLeaves { this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true) .withProperty(DECAYABLE, true)); Blocks.FIRE.setFireInfo(this, 30, 60); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, CHECK_DECAY, DECAYABLE)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, CHECK_DECAY, DECAYABLE)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 0d08f4340..d09235002 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -43,8 +43,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.util.WorldUtils; import techreborn.events.TRRecipeHandler; import techreborn.init.ModSounds; @@ -75,7 +75,7 @@ public class BlockRubberLog extends Block { this.setTickRandomly(true); this.setSoundType(SoundType.WOOD); Blocks.FIRE.setFireInfo(this, 5, 5); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockRubberPlank.java b/src/main/java/techreborn/blocks/BlockRubberPlank.java index 4484d4578..b87180b5c 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlank.java @@ -28,10 +28,10 @@ import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; -import techreborn.utils.TechRebornCreativeTab; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; /** * Created by modmuss50 on 20/02/2016. @@ -44,6 +44,6 @@ public class BlockRubberPlank extends Block { this.setHardness(2.0F); this.setSoundType(SoundType.WOOD); Blocks.FIRE.setFireInfo(this, 5, 20); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java index 263066fdf..3e298c83d 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java @@ -39,8 +39,8 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import techreborn.lib.ModInfo; import techreborn.utils.TechRebornCreativeTab; @@ -67,7 +67,7 @@ public abstract class BlockRubberPlankSlab extends BlockSlab { setSoundType(SoundType.WOOD); this.setDefaultState(iblockstate.withProperty(VARIANT, BlockRubberPlankSlab.Variant.DEFAULT)); useNeighborBrightness = true; - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankStair.java b/src/main/java/techreborn/blocks/BlockRubberPlankStair.java index 082a976e4..dfc6c4598 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankStair.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankStair.java @@ -26,8 +26,8 @@ package techreborn.blocks; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import techreborn.lib.ModInfo; import techreborn.utils.TechRebornCreativeTab; @@ -37,6 +37,6 @@ public class BlockRubberPlankStair extends BlockStairs { super(modelState); setCreativeTab(TechRebornCreativeTab.instance); useNeighborBrightness = true; - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } } \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/BlockRubberSapling.java b/src/main/java/techreborn/blocks/BlockRubberSapling.java index 1026cd56c..a944bf422 100644 --- a/src/main/java/techreborn/blocks/BlockRubberSapling.java +++ b/src/main/java/techreborn/blocks/BlockRubberSapling.java @@ -32,10 +32,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; -import techreborn.utils.TechRebornCreativeTab; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import techreborn.world.RubberTreeGenerator; import java.util.Random; @@ -49,7 +49,7 @@ public class BlockRubberSapling extends BlockSapling { setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0)); setSoundType(SoundType.PLANT); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index b07fdebf4..55310b2f3 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -34,15 +34,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseBlock; import reborncore.common.blocks.PropertyString; import reborncore.common.util.ArrayUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import java.util.List; import java.util.Random; @@ -60,7 +60,7 @@ public class BlockStorage extends BaseBlock { setHardness(2f); this.setDefaultState(this.getDefaultState().withProperty(TYPE, "silver")); for (int i = 0; i < types.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]).setFileName("storage")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]).setFileName("storage")); } TRRecipeHandler.hideEntry(this); } diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index 9b16f0155..b82529500 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -39,15 +39,15 @@ import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseBlock; import reborncore.common.blocks.PropertyString; import reborncore.common.util.ArrayUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModBlocks; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; import java.security.InvalidParameterException; @@ -68,7 +68,7 @@ public class BlockStorage2 extends BaseBlock { setHardness(2f); this.setDefaultState(this.getDefaultState().withProperty(TYPE, "tungstensteel")); for (int i = 0; i < types.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]) + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i).setInvVariant("type=" + types[i]) .setFileName("storage")); } TRRecipeHandler.hideEntry(this); diff --git a/src/main/java/techreborn/blocks/cable/BlockCable.java b/src/main/java/techreborn/blocks/cable/BlockCable.java index 83c12195c..f9a10d198 100644 --- a/src/main/java/techreborn/blocks/cable/BlockCable.java +++ b/src/main/java/techreborn/blocks/cable/BlockCable.java @@ -52,11 +52,11 @@ import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.items.WrenchHelper; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.init.ModSounds; import techreborn.lib.ModInfo; import techreborn.tiles.cable.TileCable; +import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.damageSources.ElectrialShockSource; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java index 055e0b006..4c6db580e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java @@ -35,9 +35,9 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.RebornCoreConfig; import reborncore.common.blocks.BlockWrenchEventHandler; @@ -56,7 +56,7 @@ public class BlockCreativeSolarPanel extends BaseTileBlock { super(Material.IRON); setCreativeTab(TechRebornCreativeTab.instance); setHardness(2.0F); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 0757843f2..d5b0ebd72 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -26,14 +26,14 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileDieselGenerator; +import techreborn.utils.TechRebornCreativeTab; /** * Block for Diesel Generator @@ -43,7 +43,7 @@ public class BlockDieselGenerator extends BlockMachineBase { public BlockDieselGenerator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java index 7a3e9ece4..594907a53 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java @@ -26,20 +26,20 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileDragonEggSyphon; +import techreborn.utils.TechRebornCreativeTab; public class BlockDragonEggSyphon extends BlockMachineBase { public BlockDragonEggSyphon() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index ef096b782..90609e8f2 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -26,21 +26,21 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileGasTurbine; +import techreborn.utils.TechRebornCreativeTab; public class BlockGasTurbine extends BlockMachineBase { public BlockGasTurbine() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index 7ac4fb29e..0b89e6d98 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -26,20 +26,20 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileLightningRod; +import techreborn.utils.TechRebornCreativeTab; public class BlockLightningRod extends BlockMachineBase { public BlockLightningRod() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index 33f50b208..99e5d6188 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -28,12 +28,12 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import java.util.List; @@ -42,7 +42,7 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase { public BlockMagicEnergyAbsorber() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 344dd1b40..741f7b272 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -28,12 +28,12 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import java.util.List; @@ -42,7 +42,7 @@ public class BlockMagicEnergyConverter extends BlockMachineBase { public BlockMagicEnergyConverter() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index a22736a79..eea749437 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -26,14 +26,14 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TilePlasmaGenerator; +import techreborn.utils.TechRebornCreativeTab; /** * Block for Plasma Generator @@ -43,7 +43,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase { public BlockPlasmaGenerator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index bf9285a6d..f2d44f12f 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -26,21 +26,21 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileSemiFluidGenerator; +import techreborn.utils.TechRebornCreativeTab; public class BlockSemiFluidGenerator extends BlockMachineBase { public BlockSemiFluidGenerator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java index b87865197..30e1de1ea 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java @@ -26,21 +26,21 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileSolidFuelGenerator; +import techreborn.utils.TechRebornCreativeTab; public class BlockSolidFuelGenerator extends BlockMachineBase { public BlockSolidFuelGenerator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index bb1a43240..cf7b51ab3 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -26,21 +26,21 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileThermalGenerator; +import techreborn.utils.TechRebornCreativeTab; public class BlockThermalGenerator extends BlockMachineBase { public BlockThermalGenerator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index 16ca7a526..71fe90144 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -26,9 +26,9 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileWaterMill; @@ -42,7 +42,7 @@ public class BlockWaterMill extends BlockMachineBase { public BlockWaterMill() { super(false); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index 6b3ac7b2b..163227c77 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -26,13 +26,13 @@ package techreborn.blocks.generator; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileWindMill; +import techreborn.utils.TechRebornCreativeTab; /** * Created by modmuss50 on 25/02/2016. @@ -42,7 +42,7 @@ public class BlockWindMill extends BlockMachineBase { public BlockWindMill() { super(false); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java index 568bb3717..a4ba800e3 100644 --- a/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java @@ -41,13 +41,13 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.generator.TileSolarPanel; +import techreborn.utils.TechRebornCreativeTab; /** * Created by modmuss50 on 25/02/2016. @@ -63,7 +63,7 @@ public class BlockSolarPanel extends BlockMachineBase { setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.getBlockState().getBaseState().withProperty(ACTIVE, false).withProperty(TYPE, EnumPanelType.Basic)); for (int i = 0; i < panes.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/generators").setInvVariant("active=false,type=" + panes[i])); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/generators").setInvVariant("active=false,type=" + panes[i])); } } diff --git a/src/main/java/techreborn/blocks/lighting/BlockLamp.java b/src/main/java/techreborn/blocks/lighting/BlockLamp.java index c8ffc6b36..36dc3bc88 100644 --- a/src/main/java/techreborn/blocks/lighting/BlockLamp.java +++ b/src/main/java/techreborn/blocks/lighting/BlockLamp.java @@ -41,15 +41,15 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.items.WrenchHelper; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.lighting.TileLamp; +import techreborn.utils.TechRebornCreativeTab; public class BlockLamp extends BaseTileBlock { @@ -67,7 +67,7 @@ public class BlockLamp extends BaseTileBlock { this.bbs = GenBoundingBoxes(depth, width); this.cost = cost; this.brightness = brightness; - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index 29f1c3848..474c4eeac 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -39,9 +39,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.items.WrenchHelper; @@ -67,7 +67,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock { this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.name = name; this.guiID = guiID; - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index 1fa92f711..13b575941 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -37,9 +37,9 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.RebornCoreConfig; import reborncore.common.blocks.BlockWrenchEventHandler; @@ -57,7 +57,7 @@ public class BlockLSUStorage extends BaseTileBlock { public BlockLSUStorage() { super(Material.IRON); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java index 3115567bc..182548283 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java @@ -30,14 +30,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier0.TileIronAlloyFurnace; +import techreborn.utils.TechRebornCreativeTab; import java.util.ArrayList; import java.util.List; @@ -47,7 +47,7 @@ public class BlockIronAlloyFurnace extends BlockMachineBase { public BlockIronAlloyFurnace() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index 51aca7101..f388ce181 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -34,14 +34,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier0.TileIronFurnace; +import techreborn.utils.TechRebornCreativeTab; import java.util.ArrayList; import java.util.List; @@ -52,7 +52,7 @@ public class BlockIronFurnace extends BlockMachineBase { public BlockIronFurnace() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines")); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 8fa11b8fe..8c3595da3 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileAlloySmelter; +import techreborn.utils.TechRebornCreativeTab; public class BlockAlloySmelter extends BlockMachineBase { public BlockAlloySmelter() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java index 70704d1d9..40a6365bc 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileAssemblingMachine; +import techreborn.utils.TechRebornCreativeTab; public class BlockAssemblingMachine extends BlockMachineBase { public BlockAssemblingMachine() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java index ded6d49b2..19f12cf31 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java @@ -28,14 +28,14 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileAutoCraftingTable; +import techreborn.utils.TechRebornCreativeTab; public class BlockAutoCraftingTable extends BlockMachineBase { @@ -43,7 +43,7 @@ public class BlockAutoCraftingTable extends BlockMachineBase { super(true); setUnlocalizedName("techreborn.electriccraftingtable"); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index 876b2ac09..8dbade091 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileCompressor; +import techreborn.utils.TechRebornCreativeTab; public class BlockCompressor extends BlockMachineBase { public BlockCompressor() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index d730251ce..8037ea7e5 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileElectricFurnace; +import techreborn.utils.TechRebornCreativeTab; public class BlockElectricFurnace extends BlockMachineBase { public BlockElectricFurnace() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index d77650dee..e88c36b84 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileExtractor; +import techreborn.utils.TechRebornCreativeTab; public class BlockExtractor extends BlockMachineBase { public BlockExtractor() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index fd9bd235f..ce8bfb270 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileGrinder; +import techreborn.utils.TechRebornCreativeTab; public class BlockGrinder extends BlockMachineBase { public BlockGrinder() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index cc4fe99f9..ff266c034 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -46,21 +46,21 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.IToolDrop; import reborncore.api.ToolManager; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.PropertyString; import reborncore.common.util.ArrayUtils; import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModBlocks; import techreborn.lib.MessageIDs; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TilePlayerDectector; +import techreborn.utils.TechRebornCreativeTab; import java.util.List; import java.util.Random; @@ -76,7 +76,7 @@ public class BlockPlayerDetector extends BlockMachineBase { setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.getDefaultState().withProperty(TYPE, "all")); for (int i = 0; i < types.length; i++) { - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i])); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i])); } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index c4ce814cf..7c3878b0b 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileRecycler; +import techreborn.utils.TechRebornCreativeTab; public class BlockRecycler extends BlockMachineBase { public BlockRecycler() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java index fbd8a903f..822358d26 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileRollingMachine; +import techreborn.utils.TechRebornCreativeTab; public class BlockRollingMachine extends BlockMachineBase { public BlockRollingMachine() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java index 3916cd6ab..6cac5a151 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier1; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileScrapboxinator; +import techreborn.utils.TechRebornCreativeTab; public class BlockScrapboxinator extends BlockMachineBase { public BlockScrapboxinator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java index 6c6f2f7a1..6bf84ad68 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.TileChargeOMat; +import techreborn.utils.TechRebornCreativeTab; public class BlockChargeOMat extends BlockMachineBase { public BlockChargeOMat() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java index 9d00288d5..568606cdc 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileChemicalReactor; +import techreborn.utils.TechRebornCreativeTab; public class BlockChemicalReactor extends BlockMachineBase { public BlockChemicalReactor() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java index 31534ba01..d144425f5 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java @@ -24,23 +24,23 @@ package techreborn.blocks.tier2; -import java.util.List; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.WorldUtils; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.TileDigitalChest; import techreborn.tiles.TileTechStorageBase; +import techreborn.utils.TechRebornCreativeTab; + +import java.util.List; public class BlockDigitalChest extends BlockMachineBase { @@ -48,7 +48,7 @@ public class BlockDigitalChest extends BlockMachineBase { super(); this.setUnlocalizedName("techreborn.digitalChest"); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java index 4a1006431..709ec118e 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileDistillationTower; +import techreborn.utils.TechRebornCreativeTab; public class BlockDistillationTower extends BlockMachineBase { public BlockDistillationTower() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java index 7a36aab40..5e1f576aa 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileImplosionCompressor; +import techreborn.utils.TechRebornCreativeTab; public class BlockImplosionCompressor extends BlockMachineBase { public BlockImplosionCompressor() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java index 936418fd6..a0705392b 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileIndustrialBlastFurnace; +import techreborn.utils.TechRebornCreativeTab; public class BlockIndustrialBlastFurnace extends BlockMachineBase { public BlockIndustrialBlastFurnace() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java index 23a39a20c..68ba87449 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.TileIndustrialCentrifuge; +import techreborn.utils.TechRebornCreativeTab; public class BlockIndustrialCentrifuge extends BlockMachineBase { public BlockIndustrialCentrifuge() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java index e838a84e8..e6ea2cbfb 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.tier1.TileIndustrialElectrolyzer; +import techreborn.utils.TechRebornCreativeTab; public class BlockIndustrialElectrolyzer extends BlockMachineBase { public BlockIndustrialElectrolyzer() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java index 13129712e..508eda94a 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileIndustrialGrinder; +import techreborn.utils.TechRebornCreativeTab; public class BlockIndustrialGrinder extends BlockMachineBase { public BlockIndustrialGrinder() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java index 826628f36..6ff98647d 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileIndustrialSawmill; +import techreborn.utils.TechRebornCreativeTab; public class BlockIndustrialSawmill extends BlockMachineBase { public BlockIndustrialSawmill() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java index 80a6e9156..99f7f4b5f 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier2; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileVacuumFreezer; +import techreborn.utils.TechRebornCreativeTab; public class BlockVacuumFreezer extends BlockMachineBase { public BlockVacuumFreezer() { super(); this.setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java index 1070fdffd..42b3e845f 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.TileChunkLoader; +import techreborn.utils.TechRebornCreativeTab; public class BlockChunkLoader extends BlockMachineBase { public BlockChunkLoader() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java index d4d7634e9..661ed0775 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.multiblock.TileFluidReplicator; +import techreborn.utils.TechRebornCreativeTab; public class BlockFluidReplicator extends BlockMachineBase { public BlockFluidReplicator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java index e95983837..f564f863f 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.TileMatterFabricator; +import techreborn.utils.TechRebornCreativeTab; public class BlockMatterFabricator extends BlockMachineBase { public BlockMatterFabricator() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java index 1ade1cade..b6d96621d 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java @@ -24,23 +24,23 @@ package techreborn.blocks.tier3; -import java.util.List; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.WorldUtils; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.TileQuantumChest; import techreborn.tiles.TileTechStorageBase; +import techreborn.utils.TechRebornCreativeTab; + +import java.util.List; public class BlockQuantumChest extends BlockMachineBase { @@ -48,7 +48,7 @@ public class BlockQuantumChest extends BlockMachineBase { super(); this.setUnlocalizedName("techreborn.quantumChest"); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java index 34981fce1..29f668067 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java @@ -26,21 +26,21 @@ package techreborn.blocks.tier3; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.tile.IMachineGuiHandler; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.lib.ModInfo; import techreborn.tiles.TileQuantumTank; +import techreborn.utils.TechRebornCreativeTab; public class BlockQuantumTank extends BlockMachineBase { public BlockQuantumTank() { super(); setCreativeTab(TechRebornCreativeTab.instance); - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 2871e6444..a9cb25ee3 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -39,9 +39,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import prospector.shootingstar.ShootingStar; -import prospector.shootingstar.model.ModelCompound; import reborncore.api.ToolManager; +import reborncore.client.models.ModelCompound; +import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.items.WrenchHelper; @@ -64,7 +64,7 @@ public abstract class BlockTransformer extends BaseTileBlock { setCreativeTab(TechRebornCreativeTab.instance); this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.name = name; - ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); + RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 21174ea77..3d7deabc9 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -43,7 +43,8 @@ import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.storage.TileLowVoltageSU; import techreborn.tiles.storage.TileMediumVoltageSU; -import techreborn.tiles.tier0.*; +import techreborn.tiles.tier0.TileIronAlloyFurnace; +import techreborn.tiles.tier0.TileIronFurnace; import techreborn.tiles.tier1.*; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java index 76ab5eb18..d0e618cb0 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java @@ -34,7 +34,6 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.recipe.IRecipeCrafterProvider; -import reborncore.api.tile.IUpgrade; import reborncore.api.tile.IUpgradeable; import reborncore.client.gui.slots.BaseSlot; import reborncore.client.gui.slots.SlotFake; diff --git a/src/main/java/techreborn/client/gui/TRBuilder.java b/src/main/java/techreborn/client/gui/TRBuilder.java index 6ed03cf7e..bbf566aa2 100644 --- a/src/main/java/techreborn/client/gui/TRBuilder.java +++ b/src/main/java/techreborn/client/gui/TRBuilder.java @@ -39,7 +39,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.client.config.GuiUtils; import net.minecraftforge.fml.common.Loader; import reborncore.api.tile.IUpgradeable; -import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.init.ModItems; diff --git a/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java b/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java index 72b53a881..0c18ac540 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java +++ b/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java @@ -30,7 +30,7 @@ import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; -import reborncore.client.guibuilder.GuiBuilder; +import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.tile.TileLegacyMachineBase; import techreborn.client.gui.GuiBase; import techreborn.lib.ModInfo; diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index be8a03212..23008a742 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -24,21 +24,17 @@ package techreborn.init; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.LootEntry; -import net.minecraft.world.storage.loot.LootEntryTable; -import net.minecraft.world.storage.loot.LootPool; -import net.minecraft.world.storage.loot.LootTableList; -import net.minecraft.world.storage.loot.RandomValueRange; +import net.minecraft.world.storage.loot.*; import net.minecraft.world.storage.loot.conditions.LootCondition; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import techreborn.Core; import techreborn.lib.ModInfo; +import java.util.ArrayList; +import java.util.List; + public class ModLoot { public static List lootTables = new ArrayList(); diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index 034d8d3b8..3ea36b96c 100644 --- a/src/main/java/techreborn/items/DynamicCell.java +++ b/src/main/java/techreborn/items/DynamicCell.java @@ -47,9 +47,9 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; import org.apache.commons.lang3.Validate; import reborncore.common.util.StringUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; /** * Created by modmuss50 on 17/05/2016. diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index 05c8fc192..d39ead9dc 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -29,9 +29,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index 937cf0342..2335e36de 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -28,9 +28,9 @@ import com.google.common.base.CaseFormat; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index 264682d7c..2feab5dc6 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -41,9 +41,9 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.client.hud.StackInfoElement; import reborncore.common.util.ChatUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.lib.MessageIDs; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/techreborn/items/ItemIngots.java b/src/main/java/techreborn/items/ItemIngots.java index 0be299bf3..f7abb19f8 100644 --- a/src/main/java/techreborn/items/ItemIngots.java +++ b/src/main/java/techreborn/items/ItemIngots.java @@ -29,9 +29,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; diff --git a/src/main/java/techreborn/items/ItemMissingRecipe.java b/src/main/java/techreborn/items/ItemMissingRecipe.java index 41fceee9b..410cd0a4e 100644 --- a/src/main/java/techreborn/items/ItemMissingRecipe.java +++ b/src/main/java/techreborn/items/ItemMissingRecipe.java @@ -24,8 +24,8 @@ package techreborn.items; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; +import techreborn.utils.TechRebornCreativeTab; public class ItemMissingRecipe extends ItemTR { public ItemMissingRecipe() { diff --git a/src/main/java/techreborn/items/ItemNuggets.java b/src/main/java/techreborn/items/ItemNuggets.java index 355aa816e..b925ec24e 100644 --- a/src/main/java/techreborn/items/ItemNuggets.java +++ b/src/main/java/techreborn/items/ItemNuggets.java @@ -28,9 +28,9 @@ import com.google.common.base.CaseFormat; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; diff --git a/src/main/java/techreborn/items/ItemParts.java b/src/main/java/techreborn/items/ItemParts.java index 94aab29bf..7308cae1b 100644 --- a/src/main/java/techreborn/items/ItemParts.java +++ b/src/main/java/techreborn/items/ItemParts.java @@ -32,8 +32,8 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import techreborn.Core; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index b3e77e333..697a661e3 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -29,9 +29,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import reborncore.common.util.OreUtil; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import java.security.InvalidParameterException; diff --git a/src/main/java/techreborn/items/ItemUpgrades.java b/src/main/java/techreborn/items/ItemUpgrades.java index 7ec5156fd..ea2775193 100644 --- a/src/main/java/techreborn/items/ItemUpgrades.java +++ b/src/main/java/techreborn/items/ItemUpgrades.java @@ -26,7 +26,6 @@ package techreborn.items; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -43,11 +42,9 @@ import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.util.ItemNBTHelper; import techreborn.Core; -import techreborn.utils.TechRebornCreativeTab; -import techreborn.client.container.builder.BuiltContainer; -import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModItems; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index 14b9dee99..99bcd964f 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -40,9 +40,9 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 3ad170839..12e4f1451 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -42,9 +42,9 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/items/armor/ItemTRArmour.java b/src/main/java/techreborn/items/armor/ItemTRArmour.java index 6eafe6c0a..a0c58b289 100644 --- a/src/main/java/techreborn/items/armor/ItemTRArmour.java +++ b/src/main/java/techreborn/items/armor/ItemTRArmour.java @@ -28,8 +28,8 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; +import techreborn.utils.TechRebornCreativeTab; /** * Created by modmuss50 on 26/02/2016. diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 9d44576b4..964f91f0d 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -42,11 +42,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; +import javax.annotation.Nullable; import java.util.HashSet; import java.util.Set; -import javax.annotation.Nullable; - public class ItemAdvancedDrill extends ItemDrill { // 4M FE max charge with 1k charge rate diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index febdefd04..61ab951ce 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -45,11 +45,11 @@ import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.ItemUtils; import techreborn.api.Reference; -import techreborn.utils.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; import techreborn.items.armor.ItemTRArmour; import techreborn.lib.ModInfo; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/items/tools/ItemDebugTool.java b/src/main/java/techreborn/items/tools/ItemDebugTool.java index 122b1f9e6..668d8b219 100644 --- a/src/main/java/techreborn/items/tools/ItemDebugTool.java +++ b/src/main/java/techreborn/items/tools/ItemDebugTool.java @@ -36,8 +36,8 @@ import net.minecraft.world.World; import net.minecraftforge.energy.CapabilityEnergy; import reborncore.api.power.IEnergyInterfaceTile; import reborncore.common.powerSystem.PowerSystem; -import techreborn.utils.TechRebornCreativeTab; import techreborn.items.ItemTR; +import techreborn.utils.TechRebornCreativeTab; /** * Created by Mark on 20/03/2016. diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index cdd4562dc..f64b84fab 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -35,9 +35,9 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.items.ItemTR; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 39e02477f..dc33ef790 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -41,8 +41,8 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.utils.OreDictUtils; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; import java.util.Random; diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 0bab5130a..b84326547 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -53,10 +53,10 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ChatUtils; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; import techreborn.lib.MessageIDs; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 753e90aa0..84cc1f419 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -47,9 +47,9 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemCapabilityProvider; import reborncore.common.util.ItemUtils; import reborncore.common.util.TorchHelper; -import techreborn.utils.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; +import techreborn.utils.TechRebornCreativeTab; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/techreborn/items/tools/ItemTRAxe.java b/src/main/java/techreborn/items/tools/ItemTRAxe.java index 4a14f713b..5cea94bc1 100644 --- a/src/main/java/techreborn/items/tools/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRAxe.java @@ -27,8 +27,8 @@ package techreborn.items.tools; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; +import techreborn.utils.TechRebornCreativeTab; public class ItemTRAxe extends ItemAxe { diff --git a/src/main/java/techreborn/items/tools/ItemTRHoe.java b/src/main/java/techreborn/items/tools/ItemTRHoe.java index 5edec43fe..6b52fb460 100644 --- a/src/main/java/techreborn/items/tools/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tools/ItemTRHoe.java @@ -29,8 +29,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; +import techreborn.utils.TechRebornCreativeTab; public class ItemTRHoe extends ItemHoe { diff --git a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java index e5b0fb09e..39027bedf 100644 --- a/src/main/java/techreborn/items/tools/ItemTRPickaxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRPickaxe.java @@ -27,8 +27,8 @@ package techreborn.items.tools; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; +import techreborn.utils.TechRebornCreativeTab; public class ItemTRPickaxe extends ItemPickaxe { diff --git a/src/main/java/techreborn/items/tools/ItemTRSpade.java b/src/main/java/techreborn/items/tools/ItemTRSpade.java index 5fb0fe3fe..b2d0054b9 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSpade.java +++ b/src/main/java/techreborn/items/tools/ItemTRSpade.java @@ -27,8 +27,8 @@ package techreborn.items.tools; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; +import techreborn.utils.TechRebornCreativeTab; public class ItemTRSpade extends ItemSpade { diff --git a/src/main/java/techreborn/items/tools/ItemTRSword.java b/src/main/java/techreborn/items/tools/ItemTRSword.java index 1becd59a8..86ab078aa 100644 --- a/src/main/java/techreborn/items/tools/ItemTRSword.java +++ b/src/main/java/techreborn/items/tools/ItemTRSword.java @@ -27,8 +27,8 @@ package techreborn.items.tools; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import reborncore.common.util.ItemUtils; -import techreborn.utils.TechRebornCreativeTab; import techreborn.events.TRRecipeHandler; +import techreborn.utils.TechRebornCreativeTab; public class ItemTRSword extends ItemSword { diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index 717a2783c..2111c30e0 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -32,8 +32,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; import techreborn.Core; import techreborn.client.EGui; -import techreborn.utils.TechRebornCreativeTab; import techreborn.items.ItemTR; +import techreborn.utils.TechRebornCreativeTab; public class ItemTechManual extends ItemTR { diff --git a/src/main/java/techreborn/items/tools/ItemTreeTap.java b/src/main/java/techreborn/items/tools/ItemTreeTap.java index d8b7e442c..66e8fc13d 100644 --- a/src/main/java/techreborn/items/tools/ItemTreeTap.java +++ b/src/main/java/techreborn/items/tools/ItemTreeTap.java @@ -25,8 +25,8 @@ package techreborn.items.tools; import net.minecraft.item.ItemStack; -import techreborn.utils.TechRebornCreativeTab; import techreborn.items.ItemTR; +import techreborn.utils.TechRebornCreativeTab; public class ItemTreeTap extends ItemTR { diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index 1a9bd1007..bd85254ad 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -37,8 +37,8 @@ import net.minecraftforge.server.permission.PermissionAPI; import net.minecraftforge.server.permission.context.BlockPosContext; import reborncore.api.IToolHandler; import reborncore.common.util.RebornPermissions; -import techreborn.utils.TechRebornCreativeTab; import techreborn.items.ItemTR; +import techreborn.utils.TechRebornCreativeTab; /** * Created by modmuss50 on 26/02/2016. diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 4e598ddc7..b07094632 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -37,12 +37,14 @@ import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import prospector.shootingstar.ShootingStar; import reborncore.api.tile.IUpgradeable; import reborncore.client.hud.StackInfoHUD; +import reborncore.client.models.RebornModelRegistry; import reborncore.client.multiblock.MultiblockRenderEvent; import techreborn.blocks.BlockRubberLeaves; -import techreborn.client.*; +import techreborn.client.ClientEventHandler; +import techreborn.client.IconSupplier; +import techreborn.client.RegisterItemJsons; import techreborn.client.gui.GuiBase; import techreborn.client.gui.slot.GuiSlotConfiguration; import techreborn.client.keybindings.KeyBindings; @@ -62,7 +64,7 @@ public class ClientProxy extends CommonProxy { @Override public void preInit(FMLPreInitializationEvent event) { super.preInit(event); - ShootingStar.registerModels(ModInfo.MOD_ID); + RebornModelRegistry.registerModels(ModInfo.MOD_ID); StackInfoHUD.registerElement(new ItemFrequencyTransmitter.StackInfoFreqTransmitter()); RenderingRegistry.registerEntityRenderingHandler(EntityNukePrimed.class, new RenderManagerNuke()); ModelDynamicCell.init(); diff --git a/src/main/java/techreborn/tiles/TileTechStorageBase.java b/src/main/java/techreborn/tiles/TileTechStorageBase.java index abab50b3b..6e3767985 100644 --- a/src/main/java/techreborn/tiles/TileTechStorageBase.java +++ b/src/main/java/techreborn/tiles/TileTechStorageBase.java @@ -40,11 +40,10 @@ import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; - public class TileTechStorageBase extends TileLegacyMachineBase implements IInventoryProvider, IToolDrop, IListInfoProvider {