Refactoring & cleaning
This commit is contained in:
parent
874559c21e
commit
e5736669ca
200 changed files with 1382 additions and 1596 deletions
|
@ -38,7 +38,7 @@ repositories {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "2.17.3"
|
version = "4.0.0"
|
||||||
|
|
||||||
def ENV = System.getenv()
|
def ENV = System.getenv()
|
||||||
if (ENV.BUILD_NUMBER) {
|
if (ENV.BUILD_NUMBER) {
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
package techreborn;
|
package techreborn;
|
||||||
|
|
||||||
import net.minecraft.block.BlockDispenser;
|
import net.minecraft.block.BlockDispenser;
|
||||||
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.item.crafting.IRecipe;
|
import net.minecraft.item.crafting.IRecipe;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.world.gen.structure.MapGenStructureIO;
|
import net.minecraft.world.gen.structure.MapGenStructureIO;
|
||||||
|
@ -42,12 +44,13 @@ import net.minecraftforge.fml.common.registry.EntityRegistry;
|
||||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||||
import net.minecraftforge.fml.common.registry.VillagerRegistry;
|
import net.minecraftforge.fml.common.registry.VillagerRegistry;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
import reborncore.RebornCore;
|
import reborncore.RebornCore;
|
||||||
import reborncore.api.recipe.RecipeHandler;
|
import reborncore.api.recipe.RecipeHandler;
|
||||||
import reborncore.common.multiblock.MultiblockEventHandler;
|
import reborncore.common.multiblock.MultiblockEventHandler;
|
||||||
import reborncore.common.multiblock.MultiblockServerTickHandler;
|
import reborncore.common.multiblock.MultiblockServerTickHandler;
|
||||||
import reborncore.common.network.RegisterPacketEvent;
|
import reborncore.common.network.RegisterPacketEvent;
|
||||||
import reborncore.common.util.LogHelper;
|
|
||||||
import reborncore.common.util.Torus;
|
import reborncore.common.util.Torus;
|
||||||
import techreborn.api.TechRebornAPI;
|
import techreborn.api.TechRebornAPI;
|
||||||
import techreborn.blocks.cable.EnumCableType;
|
import techreborn.blocks.cable.EnumCableType;
|
||||||
|
@ -59,7 +62,6 @@ import techreborn.events.BlockBreakHandler;
|
||||||
import techreborn.events.TRRecipeHandler;
|
import techreborn.events.TRRecipeHandler;
|
||||||
import techreborn.events.TRTickHandler;
|
import techreborn.events.TRTickHandler;
|
||||||
import techreborn.init.*;
|
import techreborn.init.*;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.packets.*;
|
import techreborn.packets.*;
|
||||||
import techreborn.proxies.CommonProxy;
|
import techreborn.proxies.CommonProxy;
|
||||||
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
||||||
|
@ -72,20 +74,34 @@ import techreborn.world.village.VillagePlantaionHandler;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCIES, acceptedMinecraftVersions = "[1.12,1.12.2]", certificateFingerprint = "8727a3141c8ec7f173b87aa78b9b9807867c4e6b", guiFactory = "techreborn.client.TechRebornGuiFactory")
|
@Mod(modid = TechReborn.MOD_ID, name = TechReborn.MOD_NAME, version = TechReborn.MOD_VERSION, dependencies = TechReborn.MOD_DEPENDENCIES, acceptedMinecraftVersions = "[1.12,1.12.2]", certificateFingerprint = "8727a3141c8ec7f173b87aa78b9b9807867c4e6b", guiFactory = "techreborn.client.TechRebornGuiFactory")
|
||||||
public class Core {
|
public class TechReborn {
|
||||||
|
|
||||||
//enable dev featues with -Dtechreborn.devFeatues=true
|
//enable dev featues with -Dtechreborn.devFeatues=true
|
||||||
public static final boolean DEV_FEATURES = Boolean.parseBoolean(System.getProperty("techreborn.devFeatues", "false"));
|
public static final boolean DEV_FEATURES = Boolean.parseBoolean(System.getProperty("techreborn.devFeatues", "false"));
|
||||||
@SidedProxy(clientSide = ModInfo.CLIENT_PROXY_CLASS, serverSide = ModInfo.SERVER_PROXY_CLASS)
|
public static final String MOD_ID = "techreborn";
|
||||||
|
public static final String MOD_NAME = "Tech Reborn";
|
||||||
|
public static final String MOD_VERSION = "@MODVERSION@";
|
||||||
|
public static final String MOD_DEPENDENCIES = "required-after:forge@[14.23.3.2694,);required-after:reborncore;after:jei@[4.7,)";
|
||||||
|
public static final String CLIENT_PROXY_CLASS = "techreborn.proxies.ClientProxy";
|
||||||
|
public static final String SERVER_PROXY_CLASS = "techreborn.proxies.CommonProxy";
|
||||||
|
public static final String GUI_FACTORY_CLASS = "techreborn.config.TechRebornGUIFactory";
|
||||||
|
public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
|
||||||
|
@SidedProxy(clientSide = TechReborn.CLIENT_PROXY_CLASS, serverSide = TechReborn.SERVER_PROXY_CLASS)
|
||||||
public static CommonProxy proxy;
|
public static CommonProxy proxy;
|
||||||
@Mod.Instance
|
@Mod.Instance
|
||||||
public static Core INSTANCE;
|
public static TechReborn INSTANCE;
|
||||||
public static LogHelper logHelper = new LogHelper(new ModInfo());
|
|
||||||
public static TechRebornWorldGen worldGen;
|
public static TechRebornWorldGen worldGen;
|
||||||
public static File configDir;
|
public static File configDir;
|
||||||
|
|
||||||
public Core() {
|
public static final CreativeTabs TAB = new CreativeTabs(MOD_ID) {
|
||||||
|
@Override
|
||||||
|
public ItemStack createIcon() {
|
||||||
|
return TRContent.Parts.MACHINE_PARTS.getStack();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public TechReborn() {
|
||||||
//Forge says to call it here, so yeah
|
//Forge says to call it here, so yeah
|
||||||
FluidRegistry.enableUniversalBucket();
|
FluidRegistry.enableUniversalBucket();
|
||||||
//Done here so its loaded before RC's config manager
|
//Done here so its loaded before RC's config manager
|
||||||
|
@ -94,7 +110,7 @@ public class Core {
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
public void preinit(FMLPreInitializationEvent event) throws IllegalAccessException, InstantiationException {
|
public void preinit(FMLPreInitializationEvent event) throws IllegalAccessException, InstantiationException {
|
||||||
event.getModMetadata().version = ModInfo.MOD_VERSION;
|
event.getModMetadata().version = MOD_VERSION;
|
||||||
INSTANCE = this;
|
INSTANCE = this;
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
|
|
||||||
|
@ -113,10 +129,7 @@ public class Core {
|
||||||
// Entitys
|
// Entitys
|
||||||
EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
|
EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
|
||||||
|
|
||||||
//Ore Dictionary
|
|
||||||
OreDict.init();
|
|
||||||
proxy.preInit(event);
|
proxy.preInit(event);
|
||||||
logHelper.info("PreInitialization Complete");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent(priority = EventPriority.LOW)//LOW is used as we want it to load as late as possible, but before crafttweaker
|
@SubscribeEvent(priority = EventPriority.LOW)//LOW is used as we want it to load as late as possible, but before crafttweaker
|
||||||
|
@ -124,7 +137,7 @@ public class Core {
|
||||||
//Register ModRecipes
|
//Register ModRecipes
|
||||||
ModRecipes.init();
|
ModRecipes.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
public void init(FMLInitializationEvent event) {
|
public void init(FMLInitializationEvent event) {
|
||||||
// Registers Chest Loot
|
// Registers Chest Loot
|
||||||
|
@ -150,7 +163,7 @@ public class Core {
|
||||||
MinecraftForge.EVENT_BUS.register(worldGen.retroGen);
|
MinecraftForge.EVENT_BUS.register(worldGen.retroGen);
|
||||||
//Village stuff
|
//Village stuff
|
||||||
VillagerRegistry.instance().registerVillageCreationHandler(new VillagePlantaionHandler());
|
VillagerRegistry.instance().registerVillageCreationHandler(new VillagePlantaionHandler());
|
||||||
MapGenStructureIO.registerStructureComponent(VillageComponentRubberPlantaion.class, new ResourceLocation(ModInfo.MOD_ID, "rubberplantation").toString());
|
MapGenStructureIO.registerStructureComponent(VillageComponentRubberPlantaion.class, new ResourceLocation(MOD_ID, "rubberplantation").toString());
|
||||||
ModLootTables.CHESTS_RUBBER_PLANTATION.toString(); //Done to make it load, then it will be read from disk
|
ModLootTables.CHESTS_RUBBER_PLANTATION.toString(); //Done to make it load, then it will be read from disk
|
||||||
// Scrapbox
|
// Scrapbox
|
||||||
if (BehaviorDispenseScrapbox.dispenseScrapboxes) {
|
if (BehaviorDispenseScrapbox.dispenseScrapboxes) {
|
||||||
|
@ -158,8 +171,6 @@ public class Core {
|
||||||
}
|
}
|
||||||
|
|
||||||
Torus.genSizeMap(TileFusionControlComputer.maxCoilSize);
|
Torus.genSizeMap(TileFusionControlComputer.maxCoilSize);
|
||||||
|
|
||||||
logHelper.info("Initialization Complete");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
@ -167,7 +178,7 @@ public class Core {
|
||||||
proxy.postInit(event);
|
proxy.postInit(event);
|
||||||
|
|
||||||
ModRecipes.postInit();
|
ModRecipes.postInit();
|
||||||
logHelper.info(RecipeHandler.recipeList.size() + " recipes loaded");
|
LOGGER.info(RecipeHandler.recipeList.size() + " recipes loaded");
|
||||||
|
|
||||||
// RecipeHandler.scanForDupeRecipes();
|
// RecipeHandler.scanForDupeRecipes();
|
||||||
// RecipeConfigManager.save();
|
// RecipeConfigManager.save();
|
||||||
|
@ -190,8 +201,7 @@ public class Core {
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
public void onFingerprintViolation(FMLFingerprintViolationEvent event) {
|
public void onFingerprintViolation(FMLFingerprintViolationEvent event) {
|
||||||
logHelper.warn("Invalid fingerprint detected for TechReborn!");
|
LOGGER.warn("Invalid fingerprint detected for Tech Reborn!");
|
||||||
RebornCore.proxy.invalidFingerprints.add("Invalid fingerprint detected for TechReborn!");
|
RebornCore.proxy.invalidFingerprints.add("Invalid fingerprint detected for Tech Reborn!");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -28,7 +28,7 @@ import reborncore.common.util.FluidUtils;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
import net.minecraftforge.fluids.FluidRegistry;
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
import techreborn.init.TRIngredients;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.tiles.multiblock.TileFluidReplicator;
|
import techreborn.tiles.multiblock.TileFluidReplicator;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
|
@ -98,7 +98,7 @@ public class FluidReplicatorRecipe implements Cloneable {
|
||||||
|
|
||||||
public List<Object> getInputs() {
|
public List<Object> getInputs() {
|
||||||
ArrayList<Object> inputs = new ArrayList<>();
|
ArrayList<Object> inputs = new ArrayList<>();
|
||||||
inputs.add(TRIngredients.Parts.UU_MATTER.getStack(input));
|
inputs.add(TRContent.Parts.UU_MATTER.getStack(input));
|
||||||
return inputs;
|
return inputs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ import reborncore.common.recipes.RecipeCrafter;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import reborncore.common.util.Tank;
|
import reborncore.common.util.Tank;
|
||||||
import techreborn.api.Reference;
|
import techreborn.api.Reference;
|
||||||
import techreborn.init.TRIngredients;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.tiles.multiblock.TileFluidReplicator;
|
import techreborn.tiles.multiblock.TileFluidReplicator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -64,7 +64,7 @@ public class FluidReplicatorRecipeCrafter extends RecipeCrafter {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
ItemStack inputStack = inventory.getStackInSlot(inputSlots[0]);
|
ItemStack inputStack = inventory.getStackInSlot(inputSlots[0]);
|
||||||
if (!inputStack.isItemEqual(TRIngredients.Parts.UU_MATTER.getStack())) {
|
if (!inputStack.isItemEqual(TRContent.Parts.UU_MATTER.getStack())) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (inputStack.getCount() < recipe.getInput()) {
|
if (inputStack.getCount() < recipe.getInput()) {
|
||||||
|
|
|
@ -71,7 +71,7 @@ public class FusionReactorRecipe {
|
||||||
* @param output This is the output stack
|
* @param output This is the output stack
|
||||||
* @param startEU This is the inital EU amount
|
* @param startEU This is the inital EU amount
|
||||||
* @param euTick This is the eu that is transfured every tick
|
* @param euTick This is the eu that is transfured every tick
|
||||||
* @param tickTime This is the time the recipe takes to process
|
* @param tickTime This is the time the recipe takes to behavior
|
||||||
*/
|
*/
|
||||||
public FusionReactorRecipe(ItemStack topInput, ItemStack bottomInput, ItemStack output, double startEU,
|
public FusionReactorRecipe(ItemStack topInput, ItemStack bottomInput, ItemStack output, double startEU,
|
||||||
double euTick, int tickTime) {
|
double euTick, int tickTime) {
|
||||||
|
|
|
@ -49,7 +49,7 @@ import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.BaseTileBlock;
|
import reborncore.common.BaseTileBlock;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.TileAlarm;
|
import techreborn.tiles.TileAlarm;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ public class BlockAlarm extends BaseTileBlock {
|
||||||
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false));
|
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH).withProperty(ACTIVE, false));
|
||||||
this.bbs = GenBoundingBoxes(0.19, 0.81);
|
this.bbs = GenBoundingBoxes(0.19, 0.81);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting"));
|
||||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,9 +38,9 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.init.ModSounds;
|
import techreborn.init.ModSounds;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
public class BlockComputerCube extends BlockMachineBase {
|
public class BlockComputerCube extends BlockMachineBase {
|
||||||
|
@ -49,7 +49,7 @@ public class BlockComputerCube extends BlockMachineBase {
|
||||||
super();
|
super();
|
||||||
this.setTranslationKey("techreborn.computercube");
|
this.setTranslationKey("techreborn.computercube");
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -42,9 +42,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.ToolManager;
|
import reborncore.api.ToolManager;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.init.ModSounds;
|
import techreborn.init.ModSounds;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
@ -57,7 +57,7 @@ public class BlockFusionCoil extends Block {
|
||||||
setHardness(2f);
|
setHardness(2f);
|
||||||
setSoundType(SoundType.METAL);
|
setSoundType(SoundType.METAL);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -38,9 +38,9 @@ import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import reborncore.common.util.Torus;
|
import reborncore.common.util.Torus;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.utils.damageSources.FusionDamageSource;
|
import techreborn.utils.damageSources.FusionDamageSource;
|
||||||
|
@ -52,7 +52,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
|
||||||
public BlockFusionControlComputer() {
|
public BlockFusionControlComputer() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -43,8 +43,8 @@ import reborncore.common.RebornCoreConfig;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
import reborncore.common.multiblock.BlockMultiblockBase;
|
import reborncore.common.multiblock.BlockMultiblockBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileMachineCasing;
|
import techreborn.tiles.TileMachineCasing;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ public class BlockMachineCasing extends BlockMultiblockBase {
|
||||||
super(Material.IRON);
|
super(Material.IRON);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
setHardness(2F);
|
setHardness(2F);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/structure"));
|
||||||
// this.setDefaultState(this.getDefaultState().withProperty(TYPE, "standard"));
|
// this.setDefaultState(this.getDefaultState().withProperty(TYPE, "standard"));
|
||||||
// for (int i = 0; i < types.length; i++) {
|
// for (int i = 0; i < types.length; i++) {
|
||||||
// RebornModelRegistry.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]));
|
||||||
|
|
|
@ -28,7 +28,7 @@ import net.minecraft.block.material.Material;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.BaseBlock;
|
import reborncore.common.BaseBlock;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
public class BlockMachineFrames extends BaseBlock {
|
public class BlockMachineFrames extends BaseBlock {
|
||||||
|
@ -40,7 +40,7 @@ public class BlockMachineFrames extends BaseBlock {
|
||||||
super(Material.IRON);
|
super(Material.IRON);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
setHardness(1f);
|
setHardness(1f);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/structure"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/structure"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// public static ItemStack getFrameByName(String name, int count) {
|
// public static ItemStack getFrameByName(String name, int count) {
|
||||||
|
|
|
@ -43,8 +43,8 @@ import net.minecraft.world.World;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.BaseBlock;
|
import reborncore.common.BaseBlock;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.entities.EntityNukePrimed;
|
import techreborn.entities.EntityNukePrimed;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -58,7 +58,7 @@ public class BlockNuke extends BaseBlock {
|
||||||
setTranslationKey("techreborn.nuke");
|
setTranslationKey("techreborn.nuke");
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false));
|
this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false));
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ignite(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase igniter) {
|
public void ignite(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase igniter) {
|
||||||
|
|
|
@ -33,15 +33,16 @@ import net.minecraft.util.NonNullList;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import reborncore.common.blocks.PropertyString;
|
import reborncore.common.blocks.PropertyString;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import reborncore.common.util.OreDrop;
|
import reborncore.common.util.OreDrop;
|
||||||
import techreborn.init.TRIngredients;
|
import techreborn.TechReborn;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
public class BlockOre extends Block {
|
public class BlockOre extends Block {
|
||||||
|
|
||||||
public static final PropertyString VARIANTS = getVarients();
|
public static final PropertyString VARIANTS = getVarients();
|
||||||
|
@ -114,22 +115,22 @@ public class BlockOre extends Block {
|
||||||
|
|
||||||
// Secondary drop, like peridot from sapphire ore added via event handler.
|
// Secondary drop, like peridot from sapphire ore added via event handler.
|
||||||
if (variant.equalsIgnoreCase("Ruby")) {
|
if (variant.equalsIgnoreCase("Ruby")) {
|
||||||
OreDrop ruby = new OreDrop(TRIngredients.Gems.RUBY.getStack(rubyMinQuatity), rubyMaxQuantity);
|
OreDrop ruby = new OreDrop(TRContent.Gems.RUBY.getStack(rubyMinQuatity), rubyMaxQuantity);
|
||||||
drops.add(ruby.getDrops(fortune, random));
|
drops.add(ruby.getDrops(fortune, random));
|
||||||
} else if (variant.equalsIgnoreCase("Sapphire")) {
|
} else if (variant.equalsIgnoreCase("Sapphire")) {
|
||||||
OreDrop sapphire = new OreDrop(TRIngredients.Gems.SAPPHIRE.getStack(sapphireMinQuantity), sapphireMaxQuantity);
|
OreDrop sapphire = new OreDrop(TRContent.Gems.SAPPHIRE.getStack(sapphireMinQuantity), sapphireMaxQuantity);
|
||||||
drops.add(sapphire.getDrops(fortune, random));
|
drops.add(sapphire.getDrops(fortune, random));
|
||||||
} else if (variant.equalsIgnoreCase("Pyrite")) {
|
} else if (variant.equalsIgnoreCase("Pyrite")) {
|
||||||
OreDrop pyriteDust = new OreDrop(TRIngredients.Dusts.PYRITE.getStack(pyriteMinQuatity), pyriteMaxQuantity);
|
OreDrop pyriteDust = new OreDrop(TRContent.Dusts.PYRITE.getStack(pyriteMinQuatity), pyriteMaxQuantity);
|
||||||
drops.add(pyriteDust.getDrops(fortune, random));
|
drops.add(pyriteDust.getDrops(fortune, random));
|
||||||
} else if (variant.equalsIgnoreCase("Sodalite")) {
|
} else if (variant.equalsIgnoreCase("Sodalite")) {
|
||||||
OreDrop sodalite = new OreDrop(TRIngredients.Dusts.SODALITE.getStack(sodaliteMinQuatity), sodaliteMaxQuantity);
|
OreDrop sodalite = new OreDrop(TRContent.Dusts.SODALITE.getStack(sodaliteMinQuatity), sodaliteMaxQuantity);
|
||||||
drops.add(sodalite.getDrops(fortune, random));
|
drops.add(sodalite.getDrops(fortune, random));
|
||||||
} else if (variant.equalsIgnoreCase("Cinnabar")) {
|
} else if (variant.equalsIgnoreCase("Cinnabar")) {
|
||||||
OreDrop cinnabar = new OreDrop(TRIngredients.Dusts.CINNABAR.getStack(cinnabarMinQuatity), cinnabarMaxQuantity);
|
OreDrop cinnabar = new OreDrop(TRContent.Dusts.CINNABAR.getStack(cinnabarMinQuatity), cinnabarMaxQuantity);
|
||||||
drops.add(cinnabar.getDrops(fortune, random));
|
drops.add(cinnabar.getDrops(fortune, random));
|
||||||
} else if (variant.equalsIgnoreCase("Sphalerite")) {
|
} else if (variant.equalsIgnoreCase("Sphalerite")) {
|
||||||
OreDrop sphalerite = new OreDrop(TRIngredients.Dusts.SPHALERITE.getStack(sphaleriteMinQuatity), sphaleriteMaxQuantity);
|
OreDrop sphalerite = new OreDrop(TRContent.Dusts.SPHALERITE.getStack(sphaleriteMinQuatity), sphaleriteMaxQuantity);
|
||||||
drops.add(sphalerite.getDrops(fortune, random));
|
drops.add(sphalerite.getDrops(fortune, random));
|
||||||
} else {
|
} else {
|
||||||
drops.add(new ItemStack(Item.getItemFromBlock(this), 1, meta));
|
drops.add(new ItemStack(Item.getItemFromBlock(this), 1, meta));
|
||||||
|
|
|
@ -33,7 +33,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
@ -46,7 +46,7 @@ public class BlockReinforcedGlass extends BlockGlass {
|
||||||
setSoundType(SoundType.STONE);
|
setSoundType(SoundType.STONE);
|
||||||
setHardness(4.0F);
|
setHardness(4.0F);
|
||||||
setResistance(60F);
|
setResistance(60F);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -40,9 +40,8 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -56,7 +55,7 @@ public class BlockRubberLeaves extends BlockLeaves {
|
||||||
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
|
this.setDefaultState(this.getDefaultState().withProperty(CHECK_DECAY, true)
|
||||||
.withProperty(DECAYABLE, true));
|
.withProperty(DECAYABLE, true));
|
||||||
Blocks.FIRE.setFireInfo(this, 30, 60);
|
Blocks.FIRE.setFireInfo(this, 30, 60);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, CHECK_DECAY, DECAYABLE));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, CHECK_DECAY, DECAYABLE));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -139,6 +138,6 @@ public class BlockRubberLeaves extends BlockLeaves {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean fancyLeaves(){
|
public boolean fancyLeaves(){
|
||||||
return Core.proxy.fancyGraphics();
|
return TechReborn.proxy.fancyGraphics();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,12 +46,12 @@ import net.minecraftforge.energy.IEnergyStorage;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.util.WorldUtils;
|
import reborncore.common.util.WorldUtils;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.events.TRRecipeHandler;
|
import techreborn.events.TRRecipeHandler;
|
||||||
import techreborn.init.ModSounds;
|
import techreborn.init.ModSounds;
|
||||||
import techreborn.init.TRIngredients;
|
import techreborn.init.TRContent;
|
||||||
import techreborn.items.tools.ItemElectricTreetap;
|
import techreborn.items.tools.ItemElectricTreetap;
|
||||||
import techreborn.items.tools.ItemTreeTap;
|
import techreborn.items.tools.ItemTreeTap;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -75,7 +75,7 @@ public class BlockRubberLog extends Block {
|
||||||
this.setTickRandomly(true);
|
this.setTickRandomly(true);
|
||||||
this.setSoundType(SoundType.WOOD);
|
this.setSoundType(SoundType.WOOD);
|
||||||
Blocks.FIRE.setFireInfo(this, 5, 5);
|
Blocks.FIRE.setFireInfo(this, 5, 5);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -186,8 +186,8 @@ public class BlockRubberLog extends Block {
|
||||||
} else {
|
} else {
|
||||||
playerIn.getHeldItem(EnumHand.MAIN_HAND).damageItem(1, playerIn);
|
playerIn.getHeldItem(EnumHand.MAIN_HAND).damageItem(1, playerIn);
|
||||||
}
|
}
|
||||||
if (!playerIn.inventory.addItemStackToInventory(TRIngredients.Parts.SAP.getStack())) {
|
if (!playerIn.inventory.addItemStackToInventory(TRContent.Parts.SAP.getStack())) {
|
||||||
WorldUtils.dropItem(TRIngredients.Parts.SAP.getStack(), worldIn, pos.offset(side));
|
WorldUtils.dropItem(TRContent.Parts.SAP.getStack(), worldIn, pos.offset(side));
|
||||||
}
|
}
|
||||||
if (playerIn instanceof EntityPlayerMP) {
|
if (playerIn instanceof EntityPlayerMP) {
|
||||||
TRRecipeHandler.unlockTRRecipes((EntityPlayerMP) playerIn);
|
TRRecipeHandler.unlockTRRecipes((EntityPlayerMP) playerIn);
|
||||||
|
@ -210,7 +210,7 @@ public class BlockRubberLog extends Block {
|
||||||
drops.add(new ItemStack(this));
|
drops.add(new ItemStack(this));
|
||||||
if (state.getValue(HAS_SAP)) {
|
if (state.getValue(HAS_SAP)) {
|
||||||
if (new Random().nextInt(4) == 0) {
|
if (new Random().nextInt(4) == 0) {
|
||||||
drops.add(TRIngredients.Parts.SAP.getStack());
|
drops.add(TRContent.Parts.SAP.getStack());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return drops;
|
return drops;
|
||||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -44,6 +44,6 @@ public class BlockRubberPlank extends Block {
|
||||||
this.setHardness(2.0F);
|
this.setHardness(2.0F);
|
||||||
this.setSoundType(SoundType.WOOD);
|
this.setSoundType(SoundType.WOOD);
|
||||||
Blocks.FIRE.setFireInfo(this, 5, 20);
|
Blocks.FIRE.setFireInfo(this, 5, 20);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
@ -67,7 +67,7 @@ public abstract class BlockRubberPlankSlab extends BlockSlab {
|
||||||
setSoundType(SoundType.WOOD);
|
setSoundType(SoundType.WOOD);
|
||||||
this.setDefaultState(iblockstate.withProperty(VARIANT, BlockRubberPlankSlab.Variant.DEFAULT));
|
this.setDefaultState(iblockstate.withProperty(VARIANT, BlockRubberPlankSlab.Variant.DEFAULT));
|
||||||
useNeighborBrightness = true;
|
useNeighborBrightness = true;
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -28,7 +28,7 @@ import net.minecraft.block.BlockStairs;
|
||||||
import net.minecraft.block.state.IBlockState;
|
import net.minecraft.block.state.IBlockState;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
public class BlockRubberPlankStair extends BlockStairs {
|
public class BlockRubberPlankStair extends BlockStairs {
|
||||||
|
@ -37,6 +37,6 @@ public class BlockRubberPlankStair extends BlockStairs {
|
||||||
super(modelState);
|
super(modelState);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
useNeighborBrightness = true;
|
useNeighborBrightness = true;
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -34,7 +34,7 @@ import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.world.RubberTreeGenerator;
|
import techreborn.world.RubberTreeGenerator;
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ public class BlockRubberSapling extends BlockSapling {
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0));
|
this.setDefaultState(this.getDefaultState().withProperty(STAGE, 0));
|
||||||
setSoundType(SoundType.PLANT);
|
setSoundType(SoundType.PLANT);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -24,13 +24,12 @@
|
||||||
|
|
||||||
package techreborn.blocks;
|
package techreborn.blocks;
|
||||||
|
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
|
|
||||||
//This is in its own class as not to load the block class before
|
//This is in its own class as not to load the block class before
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID, priority = 1, earlyReg = true)
|
@RebornRegister(modID = TechReborn.MOD_ID, priority = 1, earlyReg = true)
|
||||||
public class OreBlockStateManager {
|
public class OreBlockStateManager {
|
||||||
//This is a one off config, dont worry about it
|
//This is a one off config, dont worry about it
|
||||||
@ConfigRegistry(config = "misc", category = "misc", key = "endOreStone", comment = "Set to true to render the end ores with a stone background")
|
@ConfigRegistry(config = "misc", category = "misc", key = "endOreStone", comment = "Set to true to render the end ores with a stone background")
|
||||||
|
|
|
@ -50,11 +50,11 @@ import reborncore.api.ToolManager;
|
||||||
import reborncore.common.RebornCoreConfig;
|
import reborncore.common.RebornCoreConfig;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.init.ModSounds;
|
import techreborn.init.ModSounds;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.cable.TileCable;
|
import techreborn.tiles.cable.TileCable;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
import techreborn.utils.damageSources.ElectrialShockSource;
|
import techreborn.utils.damageSources.ElectrialShockSource;
|
||||||
|
@ -65,7 +65,7 @@ import java.security.InvalidParameterException;
|
||||||
/**
|
/**
|
||||||
* Created by modmuss50 on 19/05/2017.
|
* Created by modmuss50 on 19/05/2017.
|
||||||
*/
|
*/
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
public class BlockCable extends BlockContainer {
|
public class BlockCable extends BlockContainer {
|
||||||
|
|
||||||
public static final PropertyBool EAST = PropertyBool.create("east");
|
public static final PropertyBool EAST = PropertyBool.create("east");
|
||||||
|
|
|
@ -30,8 +30,8 @@ import net.minecraftforge.common.config.Configuration;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import reborncore.api.power.EnumPowerTier;
|
import reborncore.api.power.EnumPowerTier;
|
||||||
import reborncore.common.registration.impl.ConfigRegistryFactory;
|
import reborncore.common.registration.impl.ConfigRegistryFactory;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
public enum EnumCableType implements IStringSerializable {
|
public enum EnumCableType implements IStringSerializable {
|
||||||
COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.MEDIUM),
|
COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.MEDIUM),
|
||||||
|
@ -75,7 +75,7 @@ public enum EnumCableType implements IStringSerializable {
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void handleConfig(ConfigRegistryFactory.RebornRegistryEvent event){
|
public static void handleConfig(ConfigRegistryFactory.RebornRegistryEvent event){
|
||||||
Configuration config = event.getConfiguration(ModInfo.MOD_ID, "misc");
|
Configuration config = event.getConfiguration(TechReborn.MOD_ID, "misc");
|
||||||
for(EnumCableType cableType : values()){
|
for(EnumCableType cableType : values()){
|
||||||
cableType.transferRate = config.getInt(cableType.friendlyName + "_transfer_rate", "cable", cableType.defaultTransferRate, 0, Integer.MAX_VALUE, "Cable transfer rate");
|
cableType.transferRate = config.getInt(cableType.friendlyName + "_transfer_rate", "cable", cableType.defaultTransferRate, 0, Integer.MAX_VALUE, "Cable transfer rate");
|
||||||
cableType.canKill = config.getBoolean(cableType.friendlyName + "_do_damage", "cable", cableType.defaultCanKill, "Set to true to allow cable to do damge to enties that come in contact with it");
|
cableType.canKill = config.getBoolean(cableType.friendlyName + "_do_damage", "cable", cableType.defaultCanKill, "Set to true to allow cable to do damge to enties that come in contact with it");
|
||||||
|
|
|
@ -42,8 +42,8 @@ import reborncore.common.BaseTileBlock;
|
||||||
import reborncore.common.RebornCoreConfig;
|
import reborncore.common.RebornCoreConfig;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.generator.TileCreativeSolarPanel;
|
import techreborn.tiles.generator.TileCreativeSolarPanel;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ public class BlockCreativeSolarPanel extends BaseTileBlock {
|
||||||
super(Material.IRON);
|
super(Material.IRON);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
setHardness(2.0F);
|
setHardness(2.0F);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.generator.TileDieselGenerator;
|
import techreborn.tiles.generator.TileDieselGenerator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ public class BlockDieselGenerator extends BlockMachineBase {
|
||||||
public BlockDieselGenerator() {
|
public BlockDieselGenerator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,7 +30,7 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.generator.TileDragonEggSyphon;
|
import techreborn.tiles.generator.TileDragonEggSyphon;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ public class BlockDragonEggSyphon extends BlockMachineBase {
|
||||||
public BlockDragonEggSyphon() {
|
public BlockDragonEggSyphon() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.generator.TileGasTurbine;
|
import techreborn.tiles.generator.TileGasTurbine;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockGasTurbine extends BlockMachineBase {
|
||||||
public BlockGasTurbine() {
|
public BlockGasTurbine() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,7 +30,7 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.generator.TileLightningRod;
|
import techreborn.tiles.generator.TileLightningRod;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ public class BlockLightningRod extends BlockMachineBase {
|
||||||
public BlockLightningRod() {
|
public BlockLightningRod() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -32,7 +32,7 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -42,7 +42,7 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase {
|
||||||
public BlockMagicEnergyAbsorber() {
|
public BlockMagicEnergyAbsorber() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -32,7 +32,7 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -42,7 +42,7 @@ public class BlockMagicEnergyConverter extends BlockMachineBase {
|
||||||
public BlockMagicEnergyConverter() {
|
public BlockMagicEnergyConverter() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.generator.TilePlasmaGenerator;
|
import techreborn.tiles.generator.TilePlasmaGenerator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase {
|
||||||
public BlockPlasmaGenerator() {
|
public BlockPlasmaGenerator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.generator.TileSemiFluidGenerator;
|
import techreborn.tiles.generator.TileSemiFluidGenerator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase {
|
||||||
public BlockSemiFluidGenerator() {
|
public BlockSemiFluidGenerator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.generator.TileSolidFuelGenerator;
|
import techreborn.tiles.generator.TileSolidFuelGenerator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockSolidFuelGenerator extends BlockMachineBase {
|
||||||
public BlockSolidFuelGenerator() {
|
public BlockSolidFuelGenerator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.generator.TileThermalGenerator;
|
import techreborn.tiles.generator.TileThermalGenerator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockThermalGenerator extends BlockMachineBase {
|
||||||
public BlockThermalGenerator() {
|
public BlockThermalGenerator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,7 +30,7 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.generator.TileWaterMill;
|
import techreborn.tiles.generator.TileWaterMill;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ public class BlockWaterMill extends BlockMachineBase {
|
||||||
public BlockWaterMill() {
|
public BlockWaterMill() {
|
||||||
super(false);
|
super(false);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,7 +30,7 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.generator.TileWindMill;
|
import techreborn.tiles.generator.TileWindMill;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ public class BlockWindMill extends BlockMachineBase {
|
||||||
public BlockWindMill() {
|
public BlockWindMill() {
|
||||||
super(false);
|
super(false);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -45,7 +45,7 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.generator.TileSolarPanel;
|
import techreborn.tiles.generator.TileSolarPanel;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ public class BlockSolarPanel extends BlockMachineBase {
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
this.setDefaultState(this.getBlockState().getBaseState().withProperty(ACTIVE, false).withProperty(TYPE, EnumPanelType.Basic));
|
this.setDefaultState(this.getBlockState().getBaseState().withProperty(ACTIVE, false).withProperty(TYPE, EnumPanelType.Basic));
|
||||||
for (int i = 0; i < panes.length; i++) {
|
for (int i = 0; i < panes.length; i++) {
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/generators").setInvVariant("active=false,type=" + panes[i]));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, i, "machines/generators").setInvVariant("active=false,type=" + panes[i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.BaseTileBlock;
|
import reborncore.common.BaseTileBlock;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.lighting.TileLamp;
|
import techreborn.tiles.lighting.TileLamp;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -67,7 +67,7 @@ public class BlockLamp extends BaseTileBlock {
|
||||||
this.bbs = GenBoundingBoxes(depth, width);
|
this.bbs = GenBoundingBoxes(depth, width);
|
||||||
this.cost = cost;
|
this.cost = cost;
|
||||||
this.brightness = brightness;
|
this.brightness = brightness;
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/lighting"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting"));
|
||||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,8 +45,7 @@ import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.BaseTileBlock;
|
import reborncore.common.BaseTileBlock;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
@ -67,7 +66,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
|
||||||
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
|
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.guiID = guiID;
|
this.guiID = guiID;
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));
|
||||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,7 +171,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!playerIn.isSneaking()) {
|
if (!playerIn.isSneaking()) {
|
||||||
playerIn.openGui(Core.INSTANCE, guiID, worldIn, pos.getX(), pos.getY(), pos.getZ());
|
playerIn.openGui(TechReborn.INSTANCE, guiID, worldIn, pos.getX(), pos.getY(), pos.getZ());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,8 +44,8 @@ import reborncore.common.BaseTileBlock;
|
||||||
import reborncore.common.RebornCoreConfig;
|
import reborncore.common.RebornCoreConfig;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.lesu.TileLSUStorage;
|
import techreborn.tiles.lesu.TileLSUStorage;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ public class BlockLSUStorage extends BaseTileBlock {
|
||||||
public BlockLSUStorage() {
|
public BlockLSUStorage() {
|
||||||
super(Material.IRON);
|
super(Material.IRON);
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));
|
||||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier0.TileIronAlloyFurnace;
|
import techreborn.tiles.tier0.TileIronAlloyFurnace;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ public class BlockIronAlloyFurnace extends BlockMachineBase {
|
||||||
public BlockIronAlloyFurnace() {
|
public BlockIronAlloyFurnace() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -38,8 +38,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier0.TileIronFurnace;
|
import techreborn.tiles.tier0.TileIronFurnace;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -52,7 +52,7 @@ public class BlockIronFurnace extends BlockMachineBase {
|
||||||
public BlockIronFurnace() {
|
public BlockIronFurnace() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileAlloySmelter;
|
import techreborn.tiles.tier1.TileAlloySmelter;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockAlloySmelter extends BlockMachineBase {
|
||||||
public BlockAlloySmelter() {
|
public BlockAlloySmelter() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileAssemblingMachine;
|
import techreborn.tiles.tier1.TileAssemblingMachine;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockAssemblingMachine extends BlockMachineBase {
|
||||||
public BlockAssemblingMachine() {
|
public BlockAssemblingMachine() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -32,8 +32,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileAutoCraftingTable;
|
import techreborn.tiles.tier1.TileAutoCraftingTable;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ public class BlockAutoCraftingTable extends BlockMachineBase {
|
||||||
super(true);
|
super(true);
|
||||||
setTranslationKey("techreborn.electriccraftingtable");
|
setTranslationKey("techreborn.electriccraftingtable");
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileCompressor;
|
import techreborn.tiles.tier1.TileCompressor;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockCompressor extends BlockMachineBase {
|
||||||
public BlockCompressor() {
|
public BlockCompressor() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileElectricFurnace;
|
import techreborn.tiles.tier1.TileElectricFurnace;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockElectricFurnace extends BlockMachineBase {
|
||||||
public BlockElectricFurnace() {
|
public BlockElectricFurnace() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileExtractor;
|
import techreborn.tiles.tier1.TileExtractor;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockExtractor extends BlockMachineBase {
|
||||||
public BlockExtractor() {
|
public BlockExtractor() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileGrinder;
|
import techreborn.tiles.tier1.TileGrinder;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockGrinder extends BlockMachineBase {
|
||||||
public BlockGrinder() {
|
public BlockGrinder() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -56,9 +56,9 @@ import reborncore.common.blocks.PropertyString;
|
||||||
import reborncore.common.util.ArrayUtils;
|
import reborncore.common.util.ArrayUtils;
|
||||||
import reborncore.common.util.ChatUtils;
|
import reborncore.common.util.ChatUtils;
|
||||||
import reborncore.common.util.StringUtils;
|
import reborncore.common.util.StringUtils;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.lib.MessageIDs;
|
import techreborn.lib.MessageIDs;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TilePlayerDectector;
|
import techreborn.tiles.tier1.TilePlayerDectector;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
this.setDefaultState(this.getStateFromMeta(0));
|
this.setDefaultState(this.getStateFromMeta(0));
|
||||||
for (int i = 0; i < types.length; i++) {
|
for (int i = 0; i < types.length; i++) {
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileRecycler;
|
import techreborn.tiles.tier1.TileRecycler;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockRecycler extends BlockMachineBase {
|
||||||
public BlockRecycler() {
|
public BlockRecycler() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileRollingMachine;
|
import techreborn.tiles.tier1.TileRollingMachine;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockRollingMachine extends BlockMachineBase {
|
||||||
public BlockRollingMachine() {
|
public BlockRollingMachine() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileScrapboxinator;
|
import techreborn.tiles.tier1.TileScrapboxinator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockScrapboxinator extends BlockMachineBase {
|
||||||
public BlockScrapboxinator() {
|
public BlockScrapboxinator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileChargeOMat;
|
import techreborn.tiles.TileChargeOMat;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockChargeOMat extends BlockMachineBase {
|
||||||
public BlockChargeOMat() {
|
public BlockChargeOMat() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileChemicalReactor;
|
import techreborn.tiles.tier1.TileChemicalReactor;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockChemicalReactor extends BlockMachineBase {
|
||||||
public BlockChemicalReactor() {
|
public BlockChemicalReactor() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -34,8 +34,8 @@ import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import reborncore.common.util.WorldUtils;
|
import reborncore.common.util.WorldUtils;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileDigitalChest;
|
import techreborn.tiles.TileDigitalChest;
|
||||||
import techreborn.tiles.TileTechStorageBase;
|
import techreborn.tiles.TileTechStorageBase;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
@ -48,7 +48,7 @@ public class BlockDigitalChest extends BlockMachineBase {
|
||||||
super();
|
super();
|
||||||
this.setTranslationKey("techreborn.digitalChest");
|
this.setTranslationKey("techreborn.digitalChest");
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.multiblock.TileDistillationTower;
|
import techreborn.tiles.multiblock.TileDistillationTower;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockDistillationTower extends BlockMachineBase {
|
||||||
public BlockDistillationTower() {
|
public BlockDistillationTower() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.multiblock.TileImplosionCompressor;
|
import techreborn.tiles.multiblock.TileImplosionCompressor;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockImplosionCompressor extends BlockMachineBase {
|
||||||
public BlockImplosionCompressor() {
|
public BlockImplosionCompressor() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;
|
import techreborn.tiles.multiblock.TileIndustrialBlastFurnace;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockIndustrialBlastFurnace extends BlockMachineBase {
|
||||||
public BlockIndustrialBlastFurnace() {
|
public BlockIndustrialBlastFurnace() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileIndustrialCentrifuge;
|
import techreborn.tiles.TileIndustrialCentrifuge;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockIndustrialCentrifuge extends BlockMachineBase {
|
||||||
public BlockIndustrialCentrifuge() {
|
public BlockIndustrialCentrifuge() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.tier1.TileIndustrialElectrolyzer;
|
import techreborn.tiles.tier1.TileIndustrialElectrolyzer;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase {
|
||||||
public BlockIndustrialElectrolyzer() {
|
public BlockIndustrialElectrolyzer() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.multiblock.TileIndustrialGrinder;
|
import techreborn.tiles.multiblock.TileIndustrialGrinder;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockIndustrialGrinder extends BlockMachineBase {
|
||||||
public BlockIndustrialGrinder() {
|
public BlockIndustrialGrinder() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.multiblock.TileIndustrialSawmill;
|
import techreborn.tiles.multiblock.TileIndustrialSawmill;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
|
||||||
public BlockIndustrialSawmill() {
|
public BlockIndustrialSawmill() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.multiblock.TileVacuumFreezer;
|
import techreborn.tiles.multiblock.TileVacuumFreezer;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockVacuumFreezer extends BlockMachineBase {
|
||||||
public BlockVacuumFreezer() {
|
public BlockVacuumFreezer() {
|
||||||
super();
|
super();
|
||||||
this.setCreativeTab(TechRebornCreativeTab.instance);
|
this.setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileChunkLoader;
|
import techreborn.tiles.TileChunkLoader;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockChunkLoader extends BlockMachineBase {
|
||||||
public BlockChunkLoader() {
|
public BlockChunkLoader() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -33,8 +33,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileCreativeQuantumChest;
|
import techreborn.tiles.TileCreativeQuantumChest;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ public class BlockCreativeQuantumChest extends BlockMachineBase {
|
||||||
super();
|
super();
|
||||||
this.setTranslationKey("techreborn.creativeQuantumChest");
|
this.setTranslationKey("techreborn.creativeQuantumChest");
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileCreativeQuantumTank;
|
import techreborn.tiles.TileCreativeQuantumTank;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockCreativeQuantumTank extends BlockMachineBase {
|
||||||
public BlockCreativeQuantumTank() {
|
public BlockCreativeQuantumTank() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.multiblock.TileFluidReplicator;
|
import techreborn.tiles.multiblock.TileFluidReplicator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockFluidReplicator extends BlockMachineBase {
|
||||||
public BlockFluidReplicator() {
|
public BlockFluidReplicator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileMatterFabricator;
|
import techreborn.tiles.TileMatterFabricator;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockMatterFabricator extends BlockMachineBase {
|
||||||
public BlockMatterFabricator() {
|
public BlockMatterFabricator() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -34,8 +34,8 @@ import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
import reborncore.common.util.WorldUtils;
|
import reborncore.common.util.WorldUtils;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileQuantumChest;
|
import techreborn.tiles.TileQuantumChest;
|
||||||
import techreborn.tiles.TileTechStorageBase;
|
import techreborn.tiles.TileTechStorageBase;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
@ -48,7 +48,7 @@ public class BlockQuantumChest extends BlockMachineBase {
|
||||||
super();
|
super();
|
||||||
this.setTranslationKey("techreborn.quantumChest");
|
this.setTranslationKey("techreborn.quantumChest");
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import reborncore.client.models.ModelCompound;
|
import reborncore.client.models.ModelCompound;
|
||||||
import reborncore.client.models.RebornModelRegistry;
|
import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.blocks.BlockMachineBase;
|
import reborncore.common.blocks.BlockMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.EGui;
|
import techreborn.client.EGui;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.tiles.TileQuantumTank;
|
import techreborn.tiles.TileQuantumTank;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ public class BlockQuantumTank extends BlockMachineBase {
|
||||||
public BlockQuantumTank() {
|
public BlockQuantumTank() {
|
||||||
super();
|
super();
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -45,7 +45,7 @@ import reborncore.client.models.RebornModelRegistry;
|
||||||
import reborncore.common.BaseTileBlock;
|
import reborncore.common.BaseTileBlock;
|
||||||
import reborncore.common.blocks.BlockWrenchEventHandler;
|
import reborncore.common.blocks.BlockWrenchEventHandler;
|
||||||
import reborncore.common.items.WrenchHelper;
|
import reborncore.common.items.WrenchHelper;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.utils.TechRebornCreativeTab;
|
import techreborn.utils.TechRebornCreativeTab;
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
@ -64,7 +64,7 @@ public abstract class BlockTransformer extends BaseTileBlock {
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
|
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH));
|
||||||
this.name = name;
|
this.name = name;
|
||||||
RebornModelRegistry.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/energy"));
|
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy"));
|
||||||
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
BlockWrenchEventHandler.wrenableBlocks.add(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import reborncore.api.tile.IMachineGuiHandler;
|
import reborncore.api.tile.IMachineGuiHandler;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
public enum EGui implements IMachineGuiHandler {
|
public enum EGui implements IMachineGuiHandler {
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ public enum EGui implements IMachineGuiHandler {
|
||||||
@Override
|
@Override
|
||||||
public void open(EntityPlayer player, BlockPos pos, World world) {
|
public void open(EntityPlayer player, BlockPos pos, World world) {
|
||||||
if(!world.isRemote){
|
if(!world.isRemote){
|
||||||
player.openGui(Core.INSTANCE, this.ordinal(), world, pos.getX(), pos.getY(), pos.getZ());
|
player.openGui(TechReborn.INSTANCE, this.ordinal(), world, pos.getX(), pos.getY(), pos.getZ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,41 +33,41 @@ import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.client.model.ModelLoader;
|
import net.minecraftforge.client.model.ModelLoader;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.blocks.cable.BlockCable;
|
import techreborn.blocks.cable.BlockCable;
|
||||||
import techreborn.blocks.cable.EnumCableType;
|
import techreborn.blocks.cable.EnumCableType;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
import techreborn.init.TRContent;
|
||||||
import techreborn.init.TRItems;
|
import techreborn.init.TRItems;
|
||||||
import techreborn.init.TRIngredients;
|
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class RegisterItemJsons {
|
public class RegisterItemJsons {
|
||||||
public static void registerModels() {
|
public static void registerModels() {
|
||||||
TRIngredients.registerModel();
|
TRContent.registerModel();
|
||||||
registerItems();
|
registerItems();
|
||||||
registerBlocks();
|
registerBlocks();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void registerItems() {
|
private static void registerItems() {
|
||||||
// Armor
|
// Armor
|
||||||
register(TRItems.CLOAKING_DEVICE, "tool/cloaking_device");
|
register(TRItems.CLOAKING_DEVICE, "tool/cloaking_device");
|
||||||
register(TRItems.LAPOTRONIC_ORB_PACK, "tool/lapotronic_orbpack");
|
register(TRItems.LAPOTRONIC_ORBPACK, "tool/lapotronic_orbpack");
|
||||||
register(TRItems.LITHIUM_BATTERY_PACK, "tool/lithium_batpack");
|
register(TRItems.LITHIUM_ION_BATPACK, "tool/lithium_batpack");
|
||||||
|
|
||||||
// Battery
|
// Battery
|
||||||
register(TRItems.RE_BATTERY, "battery/re_battery");
|
register(TRItems.RECHARGEABLE_BATTERY, "battery/re_battery");
|
||||||
register(TRItems.LITHIUM_BATTERY, "battery/lithium_battery");
|
register(TRItems.LITHIUM_ION_BATTERY, "battery/lithium_battery");
|
||||||
register(TRItems.ENERGY_CRYSTAL, "battery/energy_crystal");
|
register(TRItems.ENERGY_CRYSTAL, "battery/energy_crystal");
|
||||||
register(TRItems.LAPOTRONIC_CRYSTAL, "battery/lapotron_crystal");
|
register(TRItems.LAPOTRON_CRYSTAL, "battery/lapotron_crystal");
|
||||||
register(TRItems.LAPOTRONIC_ORB, "battery/lapotronic_orb");
|
register(TRItems.LAPOTRONIC_ORB, "battery/lapotronic_orb");
|
||||||
|
|
||||||
// Tools
|
// Tools
|
||||||
register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw");
|
register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw");
|
||||||
register(TRItems.ADVANCED_DRILL, "tool/advanced_drill");
|
register(TRItems.ADVANCED_DRILL, "tool/advanced_drill");
|
||||||
register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer");
|
register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer");
|
||||||
register(TRItems.DEBUG, "misc/debug");
|
register(TRItems.DEBUG_TOOL, "misc/debug");
|
||||||
register(TRItems.DIAMOND_CHAINSAW, "tool/diamond_chainsaw");
|
register(TRItems.DIAMOND_CHAINSAW, "tool/diamond_chainsaw");
|
||||||
register(TRItems.DIAMOND_DRILL, "tool/diamond_drill");
|
register(TRItems.DIAMOND_DRILL, "tool/diamond_drill");
|
||||||
register(TRItems.DIAMOND_JACKHAMMER, "tool/diamond_jackhammer");
|
register(TRItems.DIAMOND_JACKHAMMER, "tool/diamond_jackhammer");
|
||||||
|
@ -77,18 +77,16 @@ public class RegisterItemJsons {
|
||||||
register(TRItems.ROCK_CUTTER, "tool/rock_cutter");
|
register(TRItems.ROCK_CUTTER, "tool/rock_cutter");
|
||||||
register(TRItems.STEEL_CHAINSAW, "tool/steel_chainsaw");
|
register(TRItems.STEEL_CHAINSAW, "tool/steel_chainsaw");
|
||||||
register(TRItems.STEEL_DRILL, "tool/steel_drill");
|
register(TRItems.STEEL_DRILL, "tool/steel_drill");
|
||||||
register(TRItems.STEEL_JACKHAMMER, "tool/steel_jackhammer");
|
register(TRItems.STEEL_JACKHAMMER, "tool/steel_jackhammer");
|
||||||
register(TRItems.TREE_TAP, "tool/treetap");
|
register(TRItems.TREE_TAP, "tool/treetap");
|
||||||
register(TRItems.WRENCH, "tool/wrench");
|
register(TRItems.WRENCH, "tool/wrench");
|
||||||
|
|
||||||
// Other
|
// Other
|
||||||
register(TRItems.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter");
|
register(TRItems.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter");
|
||||||
register(TRItems.SCRAP_BOX, "misc/scrapbox");
|
register(TRItems.SCRAP_BOX, "misc/scrapbox");
|
||||||
register(TRItems.MANUAL, "misc/manual");
|
register(TRItems.MANUAL, "misc/manual");
|
||||||
registerBlockstateMultiItem(TRItems.UPGRADE_OVERCLOCKER, 0, "overclock", "items/misc/upgrades");
|
;
|
||||||
registerBlockstateMultiItem(TRItems.UPGRADE_TRANSFORMER, 0, "transformer", "items/misc/upgrades");
|
|
||||||
registerBlockstateMultiItem(TRItems.UPGRADE_ENERGY_STORAGE, 0, "energy_storage", "items/misc/upgrades");
|
|
||||||
|
|
||||||
// Gem armor & tools
|
// Gem armor & tools
|
||||||
if (ConfigTechReborn.enableGemArmorAndTools) {
|
if (ConfigTechReborn.enableGemArmorAndTools) {
|
||||||
registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/tool/armour");
|
||||||
|
@ -96,7 +94,7 @@ public class RegisterItemJsons {
|
||||||
registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/tool/armour");
|
||||||
registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/tool/armour");
|
||||||
registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/tool/armour");
|
||||||
registerBlockstateMultiItem(TRItems.SAPPHIRE_CHSTPLATE, "sapphire_chestplate", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.SAPPHIRE_CHESTPLATE, "sapphire_chestplate", "items/tool/armour");
|
||||||
registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/tool/armour");
|
||||||
registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/tool/armour");
|
||||||
registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/tool/armour");
|
registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/tool/armour");
|
||||||
|
@ -121,7 +119,7 @@ public class RegisterItemJsons {
|
||||||
registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool/tool");
|
||||||
registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool/tool");
|
||||||
registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool/tool");
|
||||||
registerBlockstateMultiItem(TRItems.PERIDOT_SAPPHIRE, "peridot_spade", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.PERIDOT_SPADE, "peridot_spade", "items/tool/tool");
|
||||||
registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool/tool");
|
||||||
registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool/tool");
|
||||||
registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool/tool");
|
||||||
|
@ -130,7 +128,6 @@ public class RegisterItemJsons {
|
||||||
registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool");
|
registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling");
|
register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling");
|
||||||
|
|
||||||
for (EnumCableType cableType : EnumCableType.values()) {
|
for (EnumCableType cableType : EnumCableType.values()) {
|
||||||
|
@ -151,11 +148,11 @@ public class RegisterItemJsons {
|
||||||
|
|
||||||
private static void registerBlocks() {
|
private static void registerBlocks() {
|
||||||
register(ModBlocks.REFINED_IRON_FENCE, "iron_fence");
|
register(ModBlocks.REFINED_IRON_FENCE, "iron_fence");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void register(Item item, int meta, String name) {
|
private static void register(Item item, int meta, String name) {
|
||||||
ResourceLocation loc = new ResourceLocation(ModInfo.MOD_ID, name);
|
ResourceLocation loc = new ResourceLocation(TechReborn.MOD_ID, name);
|
||||||
ModelLoader.setCustomModelResourceLocation(item, meta,
|
ModelLoader.setCustomModelResourceLocation(item, meta,
|
||||||
new ModelResourceLocation(loc, "inventory"));
|
new ModelResourceLocation(loc, "inventory"));
|
||||||
}
|
}
|
||||||
|
@ -179,7 +176,7 @@ public class RegisterItemJsons {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void registerBlockstate(Item i, int meta, String variant, String dir) {
|
private static void registerBlockstate(Item i, int meta, String variant, String dir) {
|
||||||
ResourceLocation loc = new ResourceLocation(ModInfo.MOD_ID, dir + i.getRegistryName().getPath());
|
ResourceLocation loc = new ResourceLocation(TechReborn.MOD_ID, dir + i.getRegistryName().getPath());
|
||||||
ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "type=" + variant));
|
ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "type=" + variant));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,12 +190,12 @@ public class RegisterItemJsons {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void registerBlockstateMultiItem(Item item, String variantName, String path) {
|
private static void registerBlockstateMultiItem(Item item, String variantName, String path) {
|
||||||
ResourceLocation loc = new ResourceLocation(ModInfo.MOD_ID, path);
|
ResourceLocation loc = new ResourceLocation(TechReborn.MOD_ID, path);
|
||||||
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(loc, "type=" + variantName));
|
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(loc, "type=" + variantName));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void registerBlockstateMultiItem(Item item, int meta, String variantName, String path) {
|
private static void registerBlockstateMultiItem(Item item, int meta, String variantName, String path) {
|
||||||
ResourceLocation loc = new ResourceLocation(ModInfo.MOD_ID, path);
|
ResourceLocation loc = new ResourceLocation(TechReborn.MOD_ID, path);
|
||||||
ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(loc, "type=" + variantName));
|
ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(loc, "type=" + variantName));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,16 +25,16 @@
|
||||||
package techreborn.client;
|
package techreborn.client;
|
||||||
|
|
||||||
import reborncore.common.config.ConfigGuiFactory;
|
import reborncore.common.config.ConfigGuiFactory;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
public class TechRebornGuiFactory extends ConfigGuiFactory {
|
public class TechRebornGuiFactory extends ConfigGuiFactory {
|
||||||
@Override
|
@Override
|
||||||
public String getModID() {
|
public String getModID() {
|
||||||
return ModInfo.MOD_ID;
|
return TechReborn.MOD_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getModName() {
|
public String getModName() {
|
||||||
return ModInfo.MOD_NAME;
|
return TechReborn.MOD_NAME;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack;
|
||||||
import reborncore.client.gui.slots.SlotFilteredVoid;
|
import reborncore.client.gui.slots.SlotFilteredVoid;
|
||||||
import reborncore.common.container.RebornContainer;
|
import reborncore.common.container.RebornContainer;
|
||||||
import reborncore.common.util.Inventory;
|
import reborncore.common.util.Inventory;
|
||||||
import techreborn.init.TRIngredients;
|
import techreborn.init.TRContent;
|
||||||
|
|
||||||
public class ContainerDestructoPack extends RebornContainer {
|
public class ContainerDestructoPack extends RebornContainer {
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ public class ContainerDestructoPack extends RebornContainer {
|
||||||
|
|
||||||
private void buildContainer() {
|
private void buildContainer() {
|
||||||
this.addSlotToContainer(
|
this.addSlotToContainer(
|
||||||
new SlotFilteredVoid(inv, 0, 80, 36, new ItemStack[] { TRIngredients.Parts.MACHINE_PARTS.getStack() }));
|
new SlotFilteredVoid(inv, 0, 80, 36, new ItemStack[] { TRContent.Parts.MACHINE_PARTS.getStack() }));
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < 3; ++i) {
|
for (i = 0; i < 3; ++i) {
|
||||||
|
|
|
@ -39,7 +39,7 @@ import reborncore.client.gui.slots.SlotFake;
|
||||||
import reborncore.client.gui.slots.SlotOutput;
|
import reborncore.client.gui.slots.SlotOutput;
|
||||||
import reborncore.common.powerSystem.TilePowerAcceptor;
|
import reborncore.common.powerSystem.TilePowerAcceptor;
|
||||||
import reborncore.common.tile.TileLegacyMachineBase;
|
import reborncore.common.tile.TileLegacyMachineBase;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.container.builder.slot.FilteredSlot;
|
import techreborn.client.container.builder.slot.FilteredSlot;
|
||||||
import techreborn.client.container.builder.slot.FurnaceFuelSlot;
|
import techreborn.client.container.builder.slot.FurnaceFuelSlot;
|
||||||
import techreborn.client.container.builder.slot.UpgradeSlot;
|
import techreborn.client.container.builder.slot.UpgradeSlot;
|
||||||
|
@ -143,7 +143,7 @@ public class ContainerTileInventoryBuilder {
|
||||||
((TilePowerAcceptor) this.tile)::setExtraPowerStoage)
|
((TilePowerAcceptor) this.tile)::setExtraPowerStoage)
|
||||||
.syncIntegerValue(() -> (int) ((TilePowerAcceptor) this.tile).getPowerChange(),
|
.syncIntegerValue(() -> (int) ((TilePowerAcceptor) this.tile).getPowerChange(),
|
||||||
((TilePowerAcceptor) this.tile)::setPowerChange);
|
((TilePowerAcceptor) this.tile)::setPowerChange);
|
||||||
Core.logHelper.error(this.tile + " is not an instance of TilePowerAcceptor! Energy cannot be synced.");
|
TechReborn.LOGGER.error(this.tile + " is not an instance of TilePowerAcceptor! Energy cannot be synced.");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,7 +156,7 @@ public class ContainerTileInventoryBuilder {
|
||||||
.syncIntegerValue(() -> ((IRecipeCrafterProvider) this.tile).getRecipeCrafter().currentNeededTicks,
|
.syncIntegerValue(() -> ((IRecipeCrafterProvider) this.tile).getRecipeCrafter().currentNeededTicks,
|
||||||
(currentNeededTicks) -> ((IRecipeCrafterProvider) this.tile)
|
(currentNeededTicks) -> ((IRecipeCrafterProvider) this.tile)
|
||||||
.getRecipeCrafter().currentNeededTicks = currentNeededTicks);
|
.getRecipeCrafter().currentNeededTicks = currentNeededTicks);
|
||||||
Core.logHelper
|
TechReborn.LOGGER
|
||||||
.error(this.tile + " is not an instance of IRecipeCrafterProvider! Craft progress cannot be synced.");
|
.error(this.tile + " is not an instance of IRecipeCrafterProvider! Craft progress cannot be synced.");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,18 +24,12 @@
|
||||||
|
|
||||||
package techreborn.client.container.builder.slot;
|
package techreborn.client.container.builder.slot;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
import reborncore.api.tile.IUpgrade;
|
import reborncore.api.tile.IUpgrade;
|
||||||
import reborncore.api.tile.IUpgradeable;
|
|
||||||
import reborncore.client.gui.slots.BaseSlot;
|
import reborncore.client.gui.slots.BaseSlot;
|
||||||
import reborncore.common.util.Inventory;
|
|
||||||
import techreborn.client.container.IRightClickHandler;
|
|
||||||
import techreborn.client.container.builder.BuiltContainer;
|
|
||||||
|
|
||||||
public class UpgradeSlot extends BaseSlot implements IRightClickHandler {
|
public class UpgradeSlot extends BaseSlot {
|
||||||
|
|
||||||
public UpgradeSlot(final IItemHandler inventory, final int index, final int xPosition, final int yPosition) {
|
public UpgradeSlot(final IItemHandler inventory, final int index, final int xPosition, final int yPosition) {
|
||||||
super(inventory, index, xPosition, yPosition);
|
super(inventory, index, xPosition, yPosition);
|
||||||
|
@ -50,25 +44,4 @@ public class UpgradeSlot extends BaseSlot implements IRightClickHandler {
|
||||||
public int getSlotStackLimit() {
|
public int getSlotStackLimit() {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleRightClick(int slotID, EntityPlayer player, BuiltContainer container) {
|
|
||||||
if (inventory instanceof Inventory) {
|
|
||||||
Inventory inv = (Inventory) inventory;
|
|
||||||
TileEntity tileEntity = inv.getTile();
|
|
||||||
if (tileEntity instanceof IUpgradeable) {
|
|
||||||
IUpgradeable upgradeable = (IUpgradeable) tileEntity;
|
|
||||||
if (upgradeable.canBeUpgraded()) {
|
|
||||||
ItemStack stack = upgradeable.getUpgradeInvetory().getStackInSlot(slotID);
|
|
||||||
if (!stack.isEmpty() && stack.getItem() instanceof IUpgrade) {
|
|
||||||
if (player.world.isRemote) {
|
|
||||||
((IUpgrade) stack.getItem()).handleRightClick(tileEntity, stack, container, slotID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,13 +30,13 @@ import net.minecraft.client.gui.GuiScreen;
|
||||||
import net.minecraft.client.resources.I18n;
|
import net.minecraft.client.resources.I18n;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import techreborn.items.ItemTechManual;
|
import techreborn.items.ItemManual;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
public class GuiManual extends GuiScreen {
|
public class GuiManual extends GuiScreen {
|
||||||
|
|
||||||
ItemTechManual manual;
|
ItemManual manual;
|
||||||
EntityPlayer player;
|
EntityPlayer player;
|
||||||
|
|
||||||
private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/manual.png");
|
private static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/manual.png");
|
||||||
|
|
|
@ -42,8 +42,8 @@ import reborncore.api.tile.IUpgradeable;
|
||||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import reborncore.common.powerSystem.TilePowerAcceptor;
|
import reborncore.common.powerSystem.TilePowerAcceptor;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.TRItems;
|
import techreborn.init.TRItems;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.proxies.ClientProxy;
|
import techreborn.proxies.ClientProxy;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -55,7 +55,7 @@ import static net.minecraft.item.ItemStack.EMPTY;
|
||||||
* Created by Prospector
|
* Created by Prospector
|
||||||
*/
|
*/
|
||||||
public class TRBuilder extends GuiBuilder {
|
public class TRBuilder extends GuiBuilder {
|
||||||
public static final ResourceLocation GUI_SHEET = new ResourceLocation(ModInfo.MOD_ID.toLowerCase() + ":" + "textures/gui/gui_sheet.png");
|
public static final ResourceLocation GUI_SHEET = new ResourceLocation(TechReborn.MOD_ID.toLowerCase() + ":" + "textures/gui/gui_sheet.png");
|
||||||
|
|
||||||
public TRBuilder() {
|
public TRBuilder() {
|
||||||
super(GUI_SHEET);
|
super(GUI_SHEET);
|
||||||
|
|
|
@ -32,8 +32,8 @@ import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.text.TextFormatting;
|
import net.minecraft.util.text.TextFormatting;
|
||||||
import reborncore.client.gui.guibuilder.GuiBuilder;
|
import reborncore.client.gui.guibuilder.GuiBuilder;
|
||||||
import reborncore.common.tile.TileLegacyMachineBase;
|
import reborncore.common.tile.TileLegacyMachineBase;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.client.gui.GuiBase;
|
import techreborn.client.gui.GuiBase;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -62,7 +62,7 @@ public class ElementBase {
|
||||||
private int width;
|
private int width;
|
||||||
private int height;
|
private int height;
|
||||||
|
|
||||||
public static final ResourceLocation MECH_ELEMENTS = new ResourceLocation(ModInfo.MOD_ID, "textures/gui/elements.png");
|
public static final ResourceLocation MECH_ELEMENTS = new ResourceLocation(TechReborn.MOD_ID, "textures/gui/elements.png");
|
||||||
|
|
||||||
public ElementBase(int x, int y, SpriteContainer container) {
|
public ElementBase(int x, int y, SpriteContainer container) {
|
||||||
this.container = container;
|
this.container = container;
|
||||||
|
|
|
@ -142,7 +142,7 @@ public class FluidConfigPopupElement extends ElementBase {
|
||||||
int sy = iny + getY() + gui.guiTop;
|
int sy = iny + getY() + gui.guiTop;
|
||||||
FluidConfiguration fluidConfiguration = machineBase.fluidConfiguration;
|
FluidConfiguration fluidConfiguration = machineBase.fluidConfiguration;
|
||||||
if (fluidConfiguration == null) {
|
if (fluidConfiguration == null) {
|
||||||
RebornCore.logHelper.debug("Humm, this isnt suppoed to happen");
|
RebornCore.LOGGER.debug("Humm, this isnt suppoed to happen");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
FluidConfiguration.FluidConfig fluidConfig = fluidConfiguration.getSideDetail(side);
|
FluidConfiguration.FluidConfig fluidConfig = fluidConfiguration.getSideDetail(side);
|
||||||
|
|
|
@ -141,7 +141,7 @@ public class SlotConfigPopupElement extends ElementBase {
|
||||||
int sy = iny + getY() + gui.guiTop;
|
int sy = iny + getY() + gui.guiTop;
|
||||||
SlotConfiguration.SlotConfigHolder slotConfigHolder = machineBase.slotConfiguration.getSlotDetails(slotID);
|
SlotConfiguration.SlotConfigHolder slotConfigHolder = machineBase.slotConfiguration.getSlotDetails(slotID);
|
||||||
if(slotConfigHolder == null){
|
if(slotConfigHolder == null){
|
||||||
RebornCore.logHelper.debug("Humm, this isnt suppoed to happen");
|
RebornCore.LOGGER.debug("Humm, this isnt suppoed to happen");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SlotConfiguration.SlotConfig slotConfig = slotConfigHolder.getSideDetail(side);
|
SlotConfiguration.SlotConfig slotConfig = slotConfigHolder.getSideDetail(side);
|
||||||
|
|
|
@ -26,10 +26,12 @@ package techreborn.client.keybindings;
|
||||||
|
|
||||||
import net.minecraft.client.settings.KeyBinding;
|
import net.minecraft.client.settings.KeyBinding;
|
||||||
import org.lwjgl.input.Keyboard;
|
import org.lwjgl.input.Keyboard;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
public class KeyBindings {
|
public class KeyBindings {
|
||||||
|
|
||||||
public static KeyBinding config = new KeyBinding(ModInfo.Keys.CONFIG, Keyboard.KEY_P, ModInfo.Keys.CATEGORY);
|
public static final String CATEGORY = "keys.techreborn.category";
|
||||||
|
public static final String CONFIG = "keys.techreborn.config";
|
||||||
|
|
||||||
|
public static KeyBinding config = new KeyBinding(CONFIG, Keyboard.KEY_P, CATEGORY);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ package techreborn.client.keybindings;
|
||||||
|
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.common.gameevent.InputEvent;
|
import net.minecraftforge.fml.common.gameevent.InputEvent;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
import techreborn.lib.Key;
|
import techreborn.lib.Key;
|
||||||
|
|
||||||
public class KeyInputEventHandler {
|
public class KeyInputEventHandler {
|
||||||
|
@ -40,7 +40,7 @@ public class KeyInputEventHandler {
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void handleKeyInputEvent(InputEvent.KeyInputEvent event) {
|
public void handleKeyInputEvent(InputEvent.KeyInputEvent event) {
|
||||||
Core.logHelper.info(getPressedKeybinding());
|
TechReborn.LOGGER.info(getPressedKeybinding());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ import net.minecraft.client.resources.IResource;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
@ -53,7 +53,7 @@ public class ModelHelper {
|
||||||
|
|
||||||
return ModelBlock.deserialize(getReaderForResource(location)).getAllTransforms();
|
return ModelBlock.deserialize(getReaderForResource(location)).getAllTransforms();
|
||||||
} catch (IOException exception) {
|
} catch (IOException exception) {
|
||||||
Core.logHelper.warn("Can't load resource " + location);
|
TechReborn.LOGGER.warn("Can't load resource " + location);
|
||||||
exception.printStackTrace();
|
exception.printStackTrace();
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,11 +24,11 @@
|
||||||
|
|
||||||
package techreborn.config;
|
package techreborn.config;
|
||||||
|
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
public class ConfigTechReborn {
|
public class ConfigTechReborn {
|
||||||
@ConfigRegistry(config = "recipes", category = "railcraft", key = "disableRailcraftNugget", comment = "When true TechReborn will remove Railcraft's Iron Nugget to steel nugget recipe.")
|
@ConfigRegistry(config = "recipes", category = "railcraft", key = "disableRailcraftNugget", comment = "When true TechReborn will remove Railcraft's Iron Nugget to steel nugget recipe.")
|
||||||
public static boolean disableRailcraftSteelNuggetRecipe = false;
|
public static boolean disableRailcraftSteelNuggetRecipe = false;
|
||||||
|
|
|
@ -34,15 +34,15 @@ import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import reborncore.api.recipe.IBaseRecipeType;
|
import reborncore.api.recipe.IBaseRecipeType;
|
||||||
import reborncore.api.recipe.RecipeHandler;
|
import reborncore.api.recipe.RecipeHandler;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.api.Reference;
|
import techreborn.api.Reference;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
public class BehaviorDispenseScrapbox extends BehaviorDefaultDispenseItem {
|
public class BehaviorDispenseScrapbox extends BehaviorDefaultDispenseItem {
|
||||||
|
|
||||||
@ConfigRegistry(config = "misc", category = "general", key = "DispenserScrapbox", comment = "Dispensers will open scrapboxes")
|
@ConfigRegistry(config = "misc", category = "general", key = "DispenserScrapbox", comment = "Dispensers will open scrapboxes")
|
||||||
|
|
|
@ -31,14 +31,14 @@ import net.minecraft.util.EnumParticleTypes;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import reborncore.common.explosion.RebornExplosion;
|
import reborncore.common.explosion.RebornExplosion;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by Mark on 13/03/2016.
|
* Created by Mark on 13/03/2016.
|
||||||
*/
|
*/
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
public class EntityNukePrimed extends EntityTNTPrimed {
|
public class EntityNukePrimed extends EntityTNTPrimed {
|
||||||
|
|
||||||
@ConfigRegistry(config = "misc", category = "nuke", key = "fusetime", comment = "Nuke fuse time (ticks)")
|
@ConfigRegistry(config = "misc", category = "nuke", key = "fusetime", comment = "Nuke fuse time (ticks)")
|
||||||
|
|
|
@ -33,18 +33,18 @@ import net.minecraft.world.World;
|
||||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||||
import net.minecraftforge.event.world.BlockEvent;
|
import net.minecraftforge.event.world.BlockEvent;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.registration.impl.ConfigRegistry;
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
import reborncore.common.util.OreDrop;
|
import reborncore.common.util.OreDrop;
|
||||||
|
import techreborn.TechReborn;
|
||||||
|
import techreborn.init.TRContent;
|
||||||
import techreborn.init.TRItems;
|
import techreborn.init.TRItems;
|
||||||
import techreborn.init.TRIngredients;
|
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
import techreborn.utils.OreDictUtils;
|
import techreborn.utils.OreDictUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
public class BlockBreakHandler {
|
public class BlockBreakHandler {
|
||||||
|
|
||||||
@ConfigRegistry(config = "compat", category = "general", key = "secondaryGemDrops", comment = "Drop red and yellow garnets and peridot from any harvested oreRuby, oreSapphire, oreSphalerite. False will also disable drop from TechReborn ores.")
|
@ConfigRegistry(config = "compat", category = "general", key = "secondaryGemDrops", comment = "Drop red and yellow garnets and peridot from any harvested oreRuby, oreSapphire, oreSphalerite. False will also disable drop from TechReborn ores.")
|
||||||
|
@ -67,15 +67,15 @@ public class BlockBreakHandler {
|
||||||
List<ItemStack> drops = event.getDrops();
|
List<ItemStack> drops = event.getDrops();
|
||||||
Random random = new Random();
|
Random random = new Random();
|
||||||
if (OreDictUtils.isOre(state, "oreRuby")) {
|
if (OreDictUtils.isOre(state, "oreRuby")) {
|
||||||
OreDrop redGarnet = new OreDrop(TRIngredients.Gems.RED_GARNET.getStack(), redGarnetDropChance, 1);
|
OreDrop redGarnet = new OreDrop(TRContent.Gems.RED_GARNET.getStack(), redGarnetDropChance, 1);
|
||||||
drops.add(redGarnet.getDrops(event.getFortuneLevel(), random));
|
drops.add(redGarnet.getDrops(event.getFortuneLevel(), random));
|
||||||
}
|
}
|
||||||
else if (OreDictUtils.isOre(state, "oreSapphire")) {
|
else if (OreDictUtils.isOre(state, "oreSapphire")) {
|
||||||
OreDrop peridot = new OreDrop(TRIngredients.Gems.PERIDOT.getStack(), peridotDropChance, 1);
|
OreDrop peridot = new OreDrop(TRContent.Gems.PERIDOT.getStack(), peridotDropChance, 1);
|
||||||
drops.add(peridot.getDrops(event.getFortuneLevel(), random));
|
drops.add(peridot.getDrops(event.getFortuneLevel(), random));
|
||||||
}
|
}
|
||||||
else if (OreDictUtils.isOre(state, "oreSodalite")) {
|
else if (OreDictUtils.isOre(state, "oreSodalite")) {
|
||||||
OreDrop aluminium = new OreDrop(TRIngredients.Dusts.ALUMINUM.getStack(), aluminiumDropChance, 1);
|
OreDrop aluminium = new OreDrop(TRContent.Dusts.ALUMINUM.getStack(), aluminiumDropChance, 1);
|
||||||
drops.add(aluminium.getDrops(event.getFortuneLevel(), random));
|
drops.add(aluminium.getDrops(event.getFortuneLevel(), random));
|
||||||
}
|
}
|
||||||
else if (OreDictUtils.isOre(state, "oreCinnabar")) {
|
else if (OreDictUtils.isOre(state, "oreCinnabar")) {
|
||||||
|
@ -83,7 +83,7 @@ public class BlockBreakHandler {
|
||||||
drops.add(redstone.getDrops(event.getFortuneLevel(), random));
|
drops.add(redstone.getDrops(event.getFortuneLevel(), random));
|
||||||
}
|
}
|
||||||
else if (OreDictUtils.isOre(state, "oreSphalerite")) {
|
else if (OreDictUtils.isOre(state, "oreSphalerite")) {
|
||||||
OreDrop yellowGarnet = new OreDrop(TRIngredients.Gems.YELLOW_GARNET.getStack(), yellowGarnetDropChance, 1);
|
OreDrop yellowGarnet = new OreDrop(TRContent.Gems.YELLOW_GARNET.getStack(), yellowGarnetDropChance, 1);
|
||||||
drops.add(yellowGarnet.getDrops(event.getFortuneLevel(), random));
|
drops.add(yellowGarnet.getDrops(event.getFortuneLevel(), random));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,9 +36,9 @@ import net.minecraftforge.client.model.ModelLoader;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.blocks.fluid.BlockFluidTechReborn;
|
import techreborn.blocks.fluid.BlockFluidTechReborn;
|
||||||
import techreborn.init.ModFluids;
|
import techreborn.init.ModFluids;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author drcrazy
|
* @author drcrazy
|
||||||
|
@ -89,7 +89,7 @@ public class FluidBlockModelHandler {
|
||||||
String name = block.getTranslationKey().substring(5).toLowerCase();
|
String name = block.getTranslationKey().substring(5).toLowerCase();
|
||||||
Item item = Item.getItemFromBlock(block);
|
Item item = Item.getItemFromBlock(block);
|
||||||
ModelResourceLocation location = new ModelResourceLocation(
|
ModelResourceLocation location = new ModelResourceLocation(
|
||||||
new ResourceLocation(ModInfo.MOD_ID.toLowerCase(), "fluids"), name);
|
new ResourceLocation(TechReborn.MOD_ID.toLowerCase(), "fluids"), name);
|
||||||
|
|
||||||
ModelLoader.registerItemVariants(item);
|
ModelLoader.registerItemVariants(item);
|
||||||
ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() {
|
ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() {
|
||||||
|
|
|
@ -42,7 +42,7 @@ import reborncore.api.IListInfoProvider;
|
||||||
import reborncore.api.power.IEnergyItemInfo;
|
import reborncore.api.power.IEnergyItemInfo;
|
||||||
import reborncore.common.RebornCoreConfig;
|
import reborncore.common.RebornCoreConfig;
|
||||||
import reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
|
|
||||||
public class StackToolTipEvent {
|
public class StackToolTipEvent {
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ public class StackToolTipEvent {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (NullPointerException e) {
|
} catch (NullPointerException e) {
|
||||||
Core.logHelper.debug("Failed to load info for " + event.getItemStack().getDisplayName());
|
TechReborn.LOGGER.debug("Failed to load info for " + event.getItemStack().getDisplayName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,9 +33,9 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import net.minecraftforge.registries.IForgeRegistryEntry;
|
import net.minecraftforge.registries.IForgeRegistryEntry;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
|
import techreborn.TechReborn;
|
||||||
|
import techreborn.init.TRContent;
|
||||||
import techreborn.init.TRItems;
|
import techreborn.init.TRItems;
|
||||||
import techreborn.init.TRIngredients;
|
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
@ -80,18 +80,18 @@ public class TRRecipeHandler {
|
||||||
if (recipe.getRegistryName() == null) {
|
if (recipe.getRegistryName() == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!recipe.getRegistryName().getNamespace().equals(ModInfo.MOD_ID)) {
|
if (!recipe.getRegistryName().getNamespace().equals(TechReborn.MOD_ID)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!recipe.getRecipeOutput().getItem().getRegistryName().getNamespace().equals(ModInfo.MOD_ID)) {
|
if (!recipe.getRecipeOutput().getItem().getRegistryName().getNamespace().equals(TechReborn.MOD_ID)) {
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (hiddenEntrys.contains(recipe.getRecipeOutput().getItem())) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
// if (hiddenEntrys.contains(recipe.getRecipeOutput().getItem())) {
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
//Hide uu recipes
|
//Hide uu recipes
|
||||||
for (Ingredient ingredient : recipe.getIngredients()) {
|
for (Ingredient ingredient : recipe.getIngredients()) {
|
||||||
if (ingredient.apply(TRIngredients.Parts.UU_MATTER.getStack())) {
|
if (ingredient.apply(TRContent.Parts.UU_MATTER.getStack())) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@ import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemSlab;
|
import net.minecraft.item.ItemSlab;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import reborncore.RebornRegistry;
|
import reborncore.RebornRegistry;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
import techreborn.blocks.*;
|
import techreborn.blocks.*;
|
||||||
import techreborn.blocks.cable.BlockCable;
|
import techreborn.blocks.cable.BlockCable;
|
||||||
import techreborn.blocks.generator.*;
|
import techreborn.blocks.generator.*;
|
||||||
|
@ -46,7 +46,6 @@ import techreborn.blocks.transformers.BlockHVTransformer;
|
||||||
import techreborn.blocks.transformers.BlockLVTransformer;
|
import techreborn.blocks.transformers.BlockLVTransformer;
|
||||||
import techreborn.blocks.transformers.BlockMVTransformer;
|
import techreborn.blocks.transformers.BlockMVTransformer;
|
||||||
import techreborn.itemblocks.*;
|
import techreborn.itemblocks.*;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers all TR blocks
|
* Registers all TR blocks
|
||||||
|
@ -148,7 +147,7 @@ public class ModBlocks {
|
||||||
* Register blocks
|
* Register blocks
|
||||||
*/
|
*/
|
||||||
public static void init() {
|
public static void init() {
|
||||||
TRIngredients.registerBlocks();
|
TRContent.registerBlocks();
|
||||||
|
|
||||||
// Misc. blocks
|
// Misc. blocks
|
||||||
COMPUTER_CUBE = new BlockComputerCube();
|
COMPUTER_CUBE = new BlockComputerCube();
|
||||||
|
@ -401,7 +400,7 @@ public class ModBlocks {
|
||||||
// GameRegistry.register(itemBlock);
|
// GameRegistry.register(itemBlock);
|
||||||
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
|
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
|
||||||
|
|
||||||
Core.logHelper.info("TechReborns Blocks Loaded");
|
TechReborn.LOGGER.info("TechReborns Blocks Loaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -411,8 +410,8 @@ public class ModBlocks {
|
||||||
*/
|
*/
|
||||||
public static void registerBlock(Block block, String name) {
|
public static void registerBlock(Block block, String name) {
|
||||||
name = name.toLowerCase();
|
name = name.toLowerCase();
|
||||||
block.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
|
||||||
RebornRegistry.registerBlock(block, new ResourceLocation(ModInfo.MOD_ID, name));
|
RebornRegistry.registerBlock(block, new ResourceLocation(TechReborn.MOD_ID, name));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -423,19 +422,19 @@ public class ModBlocks {
|
||||||
*/
|
*/
|
||||||
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) {
|
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) {
|
||||||
name = name.toLowerCase();
|
name = name.toLowerCase();
|
||||||
block.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
|
||||||
RebornRegistry.registerBlock(block, itemclass, new ResourceLocation(ModInfo.MOD_ID, name));
|
RebornRegistry.registerBlock(block, itemclass, new ResourceLocation(TechReborn.MOD_ID, name));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void registerBlock(Block block, ItemBlock itemBlock, String name) {
|
public static void registerBlock(Block block, ItemBlock itemBlock, String name) {
|
||||||
name = name.toLowerCase();
|
name = name.toLowerCase();
|
||||||
block.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
|
||||||
RebornRegistry.registerBlock(block, itemBlock, new ResourceLocation(ModInfo.MOD_ID, name));
|
RebornRegistry.registerBlock(block, itemBlock, new ResourceLocation(TechReborn.MOD_ID, name));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void registerBlockNoItem(Block block, String name) {
|
public static void registerBlockNoItem(Block block, String name) {
|
||||||
name = name.toLowerCase();
|
name = name.toLowerCase();
|
||||||
block.setTranslationKey(ModInfo.MOD_ID + "." + name);
|
block.setTranslationKey(TechReborn.MOD_ID + "." + name);
|
||||||
RebornRegistry.registerBlockNoItem(block, new ResourceLocation(ModInfo.MOD_ID, name));
|
RebornRegistry.registerBlockNoItem(block, new ResourceLocation(TechReborn.MOD_ID, name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,9 +29,9 @@ import net.minecraft.block.material.Material;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
import net.minecraftforge.fluids.FluidRegistry;
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
import reborncore.RebornRegistry;
|
import reborncore.RebornRegistry;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.blocks.fluid.BlockFluidTechReborn;
|
import techreborn.blocks.fluid.BlockFluidTechReborn;
|
||||||
import techreborn.blocks.fluid.TechRebornFluid;
|
import techreborn.blocks.fluid.TechRebornFluid;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
public class ModFluids {
|
public class ModFluids {
|
||||||
|
|
||||||
|
@ -140,178 +140,178 @@ public class ModFluids {
|
||||||
public static void init() {
|
public static void init() {
|
||||||
FluidRegistry.registerFluid(BERYLLIUM);
|
FluidRegistry.registerFluid(BERYLLIUM);
|
||||||
BLOCK_BERYLLIUM = new BlockFluidTechReborn(BERYLLIUM, Material.WATER, "techreborn.berylium");
|
BLOCK_BERYLLIUM = new BlockFluidTechReborn(BERYLLIUM, Material.WATER, "techreborn.berylium");
|
||||||
registerBlock(BLOCK_BERYLLIUM, ModInfo.MOD_ID + "_" + BLOCK_BERYLLIUM.getTranslationKey().substring(5));
|
registerBlock(BLOCK_BERYLLIUM, TechReborn.MOD_ID + "_" + BLOCK_BERYLLIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
|
|
||||||
FluidRegistry.registerFluid(CALCIUM);
|
FluidRegistry.registerFluid(CALCIUM);
|
||||||
BLOCK_CALCIUM = new BlockFluidTechReborn(CALCIUM, Material.WATER, "techreborn.calcium");
|
BLOCK_CALCIUM = new BlockFluidTechReborn(CALCIUM, Material.WATER, "techreborn.calcium");
|
||||||
registerBlock(BLOCK_CALCIUM,
|
registerBlock(BLOCK_CALCIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_CALCIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_CALCIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(CALCIUM_CARBONATE);
|
FluidRegistry.registerFluid(CALCIUM_CARBONATE);
|
||||||
BLOCK_CALCIUM_CARBONATE = new BlockFluidTechReborn(CALCIUM_CARBONATE, Material.WATER,
|
BLOCK_CALCIUM_CARBONATE = new BlockFluidTechReborn(CALCIUM_CARBONATE, Material.WATER,
|
||||||
"techreborn.calciumcarbonate");
|
"techreborn.calciumcarbonate");
|
||||||
registerBlock(BLOCK_CALCIUM_CARBONATE,
|
registerBlock(BLOCK_CALCIUM_CARBONATE,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_CALCIUM_CARBONATE.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_CALCIUM_CARBONATE.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(CHLORITE);
|
FluidRegistry.registerFluid(CHLORITE);
|
||||||
BLOCK_CHLORITE = new BlockFluidTechReborn(CHLORITE, Material.WATER, "techreborn.chlorite");
|
BLOCK_CHLORITE = new BlockFluidTechReborn(CHLORITE, Material.WATER, "techreborn.chlorite");
|
||||||
registerBlock(BLOCK_CHLORITE,
|
registerBlock(BLOCK_CHLORITE,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_CHLORITE.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_CHLORITE.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(DEUTERIUM);
|
FluidRegistry.registerFluid(DEUTERIUM);
|
||||||
BLOCK_DEUTERIUM = new BlockFluidTechReborn(DEUTERIUM, Material.WATER, "techreborn.deuterium");
|
BLOCK_DEUTERIUM = new BlockFluidTechReborn(DEUTERIUM, Material.WATER, "techreborn.deuterium");
|
||||||
registerBlock(BLOCK_DEUTERIUM,
|
registerBlock(BLOCK_DEUTERIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_DEUTERIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_DEUTERIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(GLYCERYL);
|
FluidRegistry.registerFluid(GLYCERYL);
|
||||||
BLOCK_GLYCERYL = new BlockFluidTechReborn(GLYCERYL, Material.WATER, "techreborn.glyceryl");
|
BLOCK_GLYCERYL = new BlockFluidTechReborn(GLYCERYL, Material.WATER, "techreborn.glyceryl");
|
||||||
registerBlock(BLOCK_GLYCERYL,
|
registerBlock(BLOCK_GLYCERYL,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_GLYCERYL.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_GLYCERYL.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(HELIUM);
|
FluidRegistry.registerFluid(HELIUM);
|
||||||
BLOCK_HELIUM = new BlockFluidTechReborn(HELIUM, Material.WATER, "techreborn.helium");
|
BLOCK_HELIUM = new BlockFluidTechReborn(HELIUM, Material.WATER, "techreborn.helium");
|
||||||
registerBlock(BLOCK_HELIUM,
|
registerBlock(BLOCK_HELIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_HELIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_HELIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(HELIUM_3);
|
FluidRegistry.registerFluid(HELIUM_3);
|
||||||
BLOCK_HELIUM_3 = new BlockFluidTechReborn(HELIUM_3, Material.WATER, "techreborn.helium3");
|
BLOCK_HELIUM_3 = new BlockFluidTechReborn(HELIUM_3, Material.WATER, "techreborn.helium3");
|
||||||
registerBlock(BLOCK_HELIUM_3,
|
registerBlock(BLOCK_HELIUM_3,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_HELIUM_3.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_HELIUM_3.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(HELIUMPLASMA);
|
FluidRegistry.registerFluid(HELIUMPLASMA);
|
||||||
BLOCK_HELIUMPLASMA = new BlockFluidTechReborn(HELIUMPLASMA, Material.WATER, "techreborn.heliumplasma");
|
BLOCK_HELIUMPLASMA = new BlockFluidTechReborn(HELIUMPLASMA, Material.WATER, "techreborn.heliumplasma");
|
||||||
registerBlock(BLOCK_HELIUMPLASMA,
|
registerBlock(BLOCK_HELIUMPLASMA,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_HELIUMPLASMA.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_HELIUMPLASMA.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(HYDROGEN);
|
FluidRegistry.registerFluid(HYDROGEN);
|
||||||
BLOCK_HYDROGEN = new BlockFluidTechReborn(HYDROGEN, Material.WATER, "techreborn.hydrogen");
|
BLOCK_HYDROGEN = new BlockFluidTechReborn(HYDROGEN, Material.WATER, "techreborn.hydrogen");
|
||||||
registerBlock(BLOCK_HYDROGEN,
|
registerBlock(BLOCK_HYDROGEN,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_HYDROGEN.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_HYDROGEN.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(LITHIUM);
|
FluidRegistry.registerFluid(LITHIUM);
|
||||||
BLOCK_LITHIUM = new BlockFluidTechReborn(LITHIUM, Material.WATER, "techreborn.lithium");
|
BLOCK_LITHIUM = new BlockFluidTechReborn(LITHIUM, Material.WATER, "techreborn.lithium");
|
||||||
registerBlock(BLOCK_LITHIUM,
|
registerBlock(BLOCK_LITHIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_LITHIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_LITHIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(MERCURY);
|
FluidRegistry.registerFluid(MERCURY);
|
||||||
BLOCK_MERCURY = new BlockFluidTechReborn(MERCURY, Material.WATER, "techreborn.mercury");
|
BLOCK_MERCURY = new BlockFluidTechReborn(MERCURY, Material.WATER, "techreborn.mercury");
|
||||||
registerBlock(BLOCK_MERCURY,
|
registerBlock(BLOCK_MERCURY,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_MERCURY.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_MERCURY.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(METHANE);
|
FluidRegistry.registerFluid(METHANE);
|
||||||
BLOCK_METHANE = new BlockFluidTechReborn(METHANE, Material.WATER, "techreborn.methane");
|
BLOCK_METHANE = new BlockFluidTechReborn(METHANE, Material.WATER, "techreborn.methane");
|
||||||
registerBlock(BLOCK_METHANE,
|
registerBlock(BLOCK_METHANE,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_METHANE.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_METHANE.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(NITROCOAL_FUEL);
|
FluidRegistry.registerFluid(NITROCOAL_FUEL);
|
||||||
BLOCK_NITROCOAL_FUEL = new BlockFluidTechReborn(NITROCOAL_FUEL, Material.WATER,
|
BLOCK_NITROCOAL_FUEL = new BlockFluidTechReborn(NITROCOAL_FUEL, Material.WATER,
|
||||||
"techreborn.nitrocoalfuel");
|
"techreborn.nitrocoalfuel");
|
||||||
registerBlock(BLOCK_NITROCOAL_FUEL,
|
registerBlock(BLOCK_NITROCOAL_FUEL,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_NITROCOAL_FUEL.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_NITROCOAL_FUEL.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(NITROFUEL);
|
FluidRegistry.registerFluid(NITROFUEL);
|
||||||
BLOCK_NITROFUEL = new BlockFluidTechReborn(NITROFUEL, Material.WATER, "techreborn.nitrofuel");
|
BLOCK_NITROFUEL = new BlockFluidTechReborn(NITROFUEL, Material.WATER, "techreborn.nitrofuel");
|
||||||
registerBlock(BLOCK_NITROFUEL,
|
registerBlock(BLOCK_NITROFUEL,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_NITROFUEL.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_NITROFUEL.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(NITROGEN);
|
FluidRegistry.registerFluid(NITROGEN);
|
||||||
BLOCK_NITROGEN = new BlockFluidTechReborn(NITROGEN, Material.WATER, "techreborn.nitrogen");
|
BLOCK_NITROGEN = new BlockFluidTechReborn(NITROGEN, Material.WATER, "techreborn.nitrogen");
|
||||||
registerBlock(BLOCK_NITROGEN,
|
registerBlock(BLOCK_NITROGEN,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_NITROGEN.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_NITROGEN.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(NITROGENDIOXIDE);
|
FluidRegistry.registerFluid(NITROGENDIOXIDE);
|
||||||
BLOCK_NITROGENDIOXIDE = new BlockFluidTechReborn(NITROGENDIOXIDE, Material.WATER,
|
BLOCK_NITROGENDIOXIDE = new BlockFluidTechReborn(NITROGENDIOXIDE, Material.WATER,
|
||||||
"techreborn.nitrogendioxide");
|
"techreborn.nitrogendioxide");
|
||||||
registerBlock(BLOCK_NITROGENDIOXIDE,
|
registerBlock(BLOCK_NITROGENDIOXIDE,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_NITROGENDIOXIDE.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_NITROGENDIOXIDE.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(POTASSIUM);
|
FluidRegistry.registerFluid(POTASSIUM);
|
||||||
BLOCK_POTASSIUM = new BlockFluidTechReborn(POTASSIUM, Material.WATER, "techreborn.potassium");
|
BLOCK_POTASSIUM = new BlockFluidTechReborn(POTASSIUM, Material.WATER, "techreborn.potassium");
|
||||||
registerBlock(BLOCK_POTASSIUM,
|
registerBlock(BLOCK_POTASSIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_POTASSIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_POTASSIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(SILICON);
|
FluidRegistry.registerFluid(SILICON);
|
||||||
BLOCK_SILICON = new BlockFluidTechReborn(SILICON, Material.WATER, "techreborn.silicon");
|
BLOCK_SILICON = new BlockFluidTechReborn(SILICON, Material.WATER, "techreborn.silicon");
|
||||||
registerBlock(BLOCK_SILICON,
|
registerBlock(BLOCK_SILICON,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_SILICON.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_SILICON.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(SODIUM);
|
FluidRegistry.registerFluid(SODIUM);
|
||||||
BLOCK_SODIUM = new BlockFluidTechReborn(SODIUM, Material.WATER, "techreborn.sodium");
|
BLOCK_SODIUM = new BlockFluidTechReborn(SODIUM, Material.WATER, "techreborn.sodium");
|
||||||
registerBlock(BLOCK_SODIUM,
|
registerBlock(BLOCK_SODIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_SODIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_SODIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
|
|
||||||
FluidRegistry.registerFluid(SODIUMPERSULFATE);
|
FluidRegistry.registerFluid(SODIUMPERSULFATE);
|
||||||
BLOCK_SODIUMPERSULFATE = new BlockFluidTechReborn(SODIUMPERSULFATE, Material.WATER,
|
BLOCK_SODIUMPERSULFATE = new BlockFluidTechReborn(SODIUMPERSULFATE, Material.WATER,
|
||||||
"techreborn.sodiumpersulfate");
|
"techreborn.sodiumpersulfate");
|
||||||
registerBlock(BLOCK_SODIUMPERSULFATE,
|
registerBlock(BLOCK_SODIUMPERSULFATE,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_SODIUMPERSULFATE.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_SODIUMPERSULFATE.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(TRITIUM);
|
FluidRegistry.registerFluid(TRITIUM);
|
||||||
BLOCK_TRITIUM = new BlockFluidTechReborn(TRITIUM, Material.WATER, "techreborn.tritium");
|
BLOCK_TRITIUM = new BlockFluidTechReborn(TRITIUM, Material.WATER, "techreborn.tritium");
|
||||||
registerBlock(BLOCK_TRITIUM,
|
registerBlock(BLOCK_TRITIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_TRITIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_TRITIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(WOLFRAMIUM);
|
FluidRegistry.registerFluid(WOLFRAMIUM);
|
||||||
BLOCK_WOLFRAMIUM = new BlockFluidTechReborn(WOLFRAMIUM, Material.WATER, "techreborn.wolframium");
|
BLOCK_WOLFRAMIUM = new BlockFluidTechReborn(WOLFRAMIUM, Material.WATER, "techreborn.wolframium");
|
||||||
registerBlock(BLOCK_WOLFRAMIUM,
|
registerBlock(BLOCK_WOLFRAMIUM,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_WOLFRAMIUM.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_WOLFRAMIUM.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(CARBON);
|
FluidRegistry.registerFluid(CARBON);
|
||||||
BLOCK_CARBON = new BlockFluidTechReborn(CARBON, Material.WATER, "techreborn.carbon");
|
BLOCK_CARBON = new BlockFluidTechReborn(CARBON, Material.WATER, "techreborn.carbon");
|
||||||
registerBlock(BLOCK_CARBON,
|
registerBlock(BLOCK_CARBON,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_CARBON.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_CARBON.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(CARBON_FIBER);
|
FluidRegistry.registerFluid(CARBON_FIBER);
|
||||||
BLOCK_CARBON_FIBER = new BlockFluidTechReborn(CARBON_FIBER, Material.WATER, "techreborn.carbonfiber");
|
BLOCK_CARBON_FIBER = new BlockFluidTechReborn(CARBON_FIBER, Material.WATER, "techreborn.carbonfiber");
|
||||||
registerBlock(BLOCK_CARBON_FIBER,
|
registerBlock(BLOCK_CARBON_FIBER,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_CARBON_FIBER.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_CARBON_FIBER.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(NITRO_CARBON);
|
FluidRegistry.registerFluid(NITRO_CARBON);
|
||||||
BLOCK_NITRO_CARBON = new BlockFluidTechReborn(NITRO_CARBON, Material.WATER, "techreborn.nitrocarbon");
|
BLOCK_NITRO_CARBON = new BlockFluidTechReborn(NITRO_CARBON, Material.WATER, "techreborn.nitrocarbon");
|
||||||
registerBlock(BLOCK_NITRO_CARBON,
|
registerBlock(BLOCK_NITRO_CARBON,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_NITRO_CARBON.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_NITRO_CARBON.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(SULFUR);
|
FluidRegistry.registerFluid(SULFUR);
|
||||||
BLOCK_SULFUR = new BlockFluidTechReborn(SULFUR, Material.WATER, "techreborn.sulfur");
|
BLOCK_SULFUR = new BlockFluidTechReborn(SULFUR, Material.WATER, "techreborn.sulfur");
|
||||||
registerBlock(BLOCK_SULFUR,
|
registerBlock(BLOCK_SULFUR,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_SULFUR.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_SULFUR.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(SODIUM_SULFIDE);
|
FluidRegistry.registerFluid(SODIUM_SULFIDE);
|
||||||
BLOCK_SODIUM_SULFIDE = new BlockFluidTechReborn(SODIUM_SULFIDE, Material.WATER, "techreborn.sodiumsulfide");
|
BLOCK_SODIUM_SULFIDE = new BlockFluidTechReborn(SODIUM_SULFIDE, Material.WATER, "techreborn.sodiumsulfide");
|
||||||
registerBlock(BLOCK_SODIUM_SULFIDE,
|
registerBlock(BLOCK_SODIUM_SULFIDE,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_SODIUM_SULFIDE.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_SODIUM_SULFIDE.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(DIESEL);
|
FluidRegistry.registerFluid(DIESEL);
|
||||||
BLOCK_DIESEL = new BlockFluidTechReborn(DIESEL, Material.WATER, "techreborn.diesel");
|
BLOCK_DIESEL = new BlockFluidTechReborn(DIESEL, Material.WATER, "techreborn.diesel");
|
||||||
registerBlock(BLOCK_DIESEL,
|
registerBlock(BLOCK_DIESEL,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_DIESEL.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_DIESEL.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(NITRO_DIESEL);
|
FluidRegistry.registerFluid(NITRO_DIESEL);
|
||||||
BLOCK_NITRO_DIESEL = new BlockFluidTechReborn(NITRO_DIESEL, Material.WATER, "techreborn.nitrodiesel");
|
BLOCK_NITRO_DIESEL = new BlockFluidTechReborn(NITRO_DIESEL, Material.WATER, "techreborn.nitrodiesel");
|
||||||
registerBlock(BLOCK_NITRO_DIESEL,
|
registerBlock(BLOCK_NITRO_DIESEL,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_NITRO_DIESEL.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_NITRO_DIESEL.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(OIL);
|
FluidRegistry.registerFluid(OIL);
|
||||||
BLOCK_OIL = new BlockFluidTechReborn(OIL, Material.WATER, "techreborn.oil");
|
BLOCK_OIL = new BlockFluidTechReborn(OIL, Material.WATER, "techreborn.oil");
|
||||||
registerBlock(BLOCK_OIL,
|
registerBlock(BLOCK_OIL,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_OIL.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_OIL.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(SULFURIC_ACID);
|
FluidRegistry.registerFluid(SULFURIC_ACID);
|
||||||
BLOCK_SULFURIC_ACID = new BlockFluidTechReborn(SULFURIC_ACID, Material.WATER, "techreborn.sulfuricacid");
|
BLOCK_SULFURIC_ACID = new BlockFluidTechReborn(SULFURIC_ACID, Material.WATER, "techreborn.sulfuricacid");
|
||||||
registerBlock(BLOCK_SULFURIC_ACID,
|
registerBlock(BLOCK_SULFURIC_ACID,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_SULFURIC_ACID.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_SULFURIC_ACID.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(COMPRESSED_AIR);
|
FluidRegistry.registerFluid(COMPRESSED_AIR);
|
||||||
BLOCK_COMPRESSED_AIR = new BlockFluidTechReborn(COMPRESSED_AIR, Material.WATER, "techreborn.compressedair");
|
BLOCK_COMPRESSED_AIR = new BlockFluidTechReborn(COMPRESSED_AIR, Material.WATER, "techreborn.compressedair");
|
||||||
registerBlock(BLOCK_COMPRESSED_AIR,
|
registerBlock(BLOCK_COMPRESSED_AIR,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_COMPRESSED_AIR.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_COMPRESSED_AIR.getTranslationKey().substring(5));
|
||||||
|
|
||||||
FluidRegistry.registerFluid(ELECTROLYZED_WATER);
|
FluidRegistry.registerFluid(ELECTROLYZED_WATER);
|
||||||
BLOCK_ELECTROLYZED_WATER = new BlockFluidTechReborn(ELECTROLYZED_WATER, Material.WATER, "techreborn.electrolyzedwater");
|
BLOCK_ELECTROLYZED_WATER = new BlockFluidTechReborn(ELECTROLYZED_WATER, Material.WATER, "techreborn.electrolyzedwater");
|
||||||
registerBlock(BLOCK_ELECTROLYZED_WATER,
|
registerBlock(BLOCK_ELECTROLYZED_WATER,
|
||||||
ModInfo.MOD_ID + "_" + BLOCK_ELECTROLYZED_WATER.getTranslationKey().substring(5));
|
TechReborn.MOD_ID + "_" + BLOCK_ELECTROLYZED_WATER.getTranslationKey().substring(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void registerBlock(Block block, String name) {
|
public static void registerBlock(Block block, String name) {
|
||||||
|
|
|
@ -29,9 +29,8 @@ import net.minecraft.world.storage.loot.*;
|
||||||
import net.minecraft.world.storage.loot.conditions.LootCondition;
|
import net.minecraft.world.storage.loot.conditions.LootCondition;
|
||||||
import net.minecraftforge.event.LootTableLoadEvent;
|
import net.minecraftforge.event.LootTableLoadEvent;
|
||||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -42,22 +41,22 @@ public class ModLoot {
|
||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
if (ConfigTechReborn.enableOverworldLoot) {
|
if (ConfigTechReborn.enableOverworldLoot) {
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/abandoned_mineshaft"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/abandoned_mineshaft"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/desert_pyramid"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/desert_pyramid"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/igloo_chest"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/igloo_chest"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/jungle_temple"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/jungle_temple"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/simple_dungeon"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/simple_dungeon"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_corridor"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/stronghold_corridor"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_crossing"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/stronghold_crossing"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/stronghold_library"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/stronghold_library"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/village_blacksmith"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/village_blacksmith"));
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/woodland_mansion"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/woodland_mansion"));
|
||||||
}
|
}
|
||||||
if (ConfigTechReborn.enableNetherLoot) {
|
if (ConfigTechReborn.enableNetherLoot) {
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/nether_bridge"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/nether_bridge"));
|
||||||
}
|
}
|
||||||
if (ConfigTechReborn.enableEndLoot) {
|
if (ConfigTechReborn.enableEndLoot) {
|
||||||
lootTables.add(new ResourceLocation(ModInfo.MOD_ID, "chests/end_city_treasure"));
|
lootTables.add(new ResourceLocation(TechReborn.MOD_ID, "chests/end_city_treasure"));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (ResourceLocation lootTable : lootTables) {
|
for (ResourceLocation lootTable : lootTables) {
|
||||||
|
@ -73,8 +72,8 @@ public class ModLoot {
|
||||||
for (ResourceLocation lootTable : lootTables) {
|
for (ResourceLocation lootTable : lootTables) {
|
||||||
if (event.getName().getNamespace().equals(lootTable.getPath())) {
|
if (event.getName().getNamespace().equals(lootTable.getPath())) {
|
||||||
event.getTable().addPool(getLootPool(lootTable));
|
event.getTable().addPool(getLootPool(lootTable));
|
||||||
if (Core.DEV_FEATURES) {
|
if (TechReborn.DEV_FEATURES) {
|
||||||
Core.logHelper.info("Loot pool injected into " + lootTable.getPath());
|
TechReborn.LOGGER.info("Loot pool injected into " + lootTable.getPath());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,17 +33,16 @@ import net.minecraftforge.fluids.FluidStack;
|
||||||
import net.minecraftforge.fluids.FluidUtil;
|
import net.minecraftforge.fluids.FluidUtil;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
import reborncore.api.recipe.RecipeHandler;
|
import reborncore.api.recipe.RecipeHandler;
|
||||||
import reborncore.common.registration.RebornRegistry;
|
import reborncore.common.registration.RebornRegister;
|
||||||
import reborncore.common.util.ItemUtils;
|
import reborncore.common.util.ItemUtils;
|
||||||
import reborncore.common.util.OreUtil;
|
import reborncore.common.util.OreUtil;
|
||||||
import techreborn.Core;
|
import techreborn.TechReborn;
|
||||||
import techreborn.api.Reference;
|
import techreborn.api.Reference;
|
||||||
import techreborn.api.recipe.machines.GrinderRecipe;
|
import techreborn.api.recipe.machines.GrinderRecipe;
|
||||||
import techreborn.api.recipe.machines.VacuumFreezerRecipe;
|
import techreborn.api.recipe.machines.VacuumFreezerRecipe;
|
||||||
import techreborn.config.ConfigTechReborn;
|
import techreborn.config.ConfigTechReborn;
|
||||||
import techreborn.init.recipes.*;
|
import techreborn.init.recipes.*;
|
||||||
import techreborn.items.*;
|
import techreborn.items.*;
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -54,7 +53,7 @@ import static techreborn.utils.OreDictUtils.getDictOreOrEmpty;
|
||||||
import static techreborn.utils.OreDictUtils.isDictPrefixed;
|
import static techreborn.utils.OreDictUtils.isDictPrefixed;
|
||||||
import static techreborn.utils.OreDictUtils.joinDictName;
|
import static techreborn.utils.OreDictUtils.joinDictName;
|
||||||
|
|
||||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
public class ModRecipes {
|
public class ModRecipes {
|
||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
|
@ -93,7 +92,7 @@ public class ModRecipes {
|
||||||
ItemStack input = (ItemStack) entry.getKey();
|
ItemStack input = (ItemStack) entry.getKey();
|
||||||
ItemStack output = (ItemStack) entry.getValue();
|
ItemStack output = (ItemStack) entry.getValue();
|
||||||
if (ItemUtils.isInputEqual("nuggetSteel", output, true, true, false) && ItemUtils.isInputEqual("nuggetIron", input, true, true, false)) {
|
if (ItemUtils.isInputEqual("nuggetSteel", output, true, true, false) && ItemUtils.isInputEqual("nuggetIron", input, true, true, false)) {
|
||||||
Core.logHelper.info("Removing a steelnugget smelting recipe");
|
TechReborn.LOGGER.info("Removing a steelnugget smelting recipe");
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -293,7 +292,7 @@ public class ModRecipes {
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
boolean ore = data[0].equals("ore");
|
boolean ore = data[0].equals("ore");
|
||||||
Core.logHelper.debug("Ore: " + data[1]);
|
TechReborn.LOGGER.debug("Ore: " + data[1]);
|
||||||
ItemStack dust = getDictOreOrEmpty(joinDictName("dust", data[1]), ore ? 2 : 1);
|
ItemStack dust = getDictOreOrEmpty(joinDictName("dust", data[1]), ore ? 2 : 1);
|
||||||
if (dust.isEmpty() || dust.getItem() == null) {
|
if (dust.isEmpty() || dust.getItem() == null) {
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -28,7 +28,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||||
import reborncore.common.tile.TileLegacyMachineBase;
|
import reborncore.common.tile.TileLegacyMachineBase;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.TechReborn;
|
||||||
import techreborn.tiles.*;
|
import techreborn.tiles.*;
|
||||||
import techreborn.tiles.cable.TileCable;
|
import techreborn.tiles.cable.TileCable;
|
||||||
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
||||||
|
@ -121,7 +121,7 @@ public enum ModTileEntities {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
ModTileEntities(Class<? extends TileEntity> tileClass, String name) {
|
ModTileEntities(Class<? extends TileEntity> tileClass, String name) {
|
||||||
this(tileClass, new ResourceLocation(ModInfo.MOD_ID, name));
|
this(tileClass, new ResourceLocation(TechReborn.MOD_ID, name));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -60,17 +60,17 @@ public class OreDict {
|
||||||
// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
// OreUtil.registerOre("leavesRubber", new ItemStack(RUBBER_LEAVES, 1, OreDictionary.WILDCARD_VALUE));
|
||||||
|
|
||||||
// Parts
|
// Parts
|
||||||
OreUtil.registerOre("circuitBasic", TRIngredients.Parts.ELECTRONIC_CIRCUIT.getStack());
|
OreUtil.registerOre("circuitBasic", TRContent.Parts.ELECTRONIC_CIRCUIT.getStack());
|
||||||
OreUtil.registerOre("circuitAdvanced", TRIngredients.Parts.ADVANCED_CIRCUIT.getStack());
|
OreUtil.registerOre("circuitAdvanced", TRContent.Parts.ADVANCED_CIRCUIT.getStack());
|
||||||
OreUtil.registerOre("circuitElite", TRIngredients.Parts.INDUSTRIAL_CIRCUIT.getStack());
|
OreUtil.registerOre("circuitElite", TRContent.Parts.INDUSTRIAL_CIRCUIT.getStack());
|
||||||
OreUtil.registerOre("circuitStorage", TRIngredients.Parts.DATA_STORAGE_CHIP.getStack());
|
OreUtil.registerOre("circuitStorage", TRContent.Parts.DATA_STORAGE_CHIP.getStack());
|
||||||
OreUtil.registerOre("circuitMaster", TRIngredients.Parts.ENERGY_FLOW_CHIP.getStack());
|
OreUtil.registerOre("circuitMaster", TRContent.Parts.ENERGY_FLOW_CHIP.getStack());
|
||||||
OreUtil.registerOre("craftingDiamondGrinder", TRIngredients.Parts.DIAMOND_GRINDING_HEAD.getStack());
|
OreUtil.registerOre("craftingDiamondGrinder", TRContent.Parts.DIAMOND_GRINDING_HEAD.getStack());
|
||||||
OreUtil.registerOre("craftingTungstenGrinder", TRIngredients.Parts.TUNGSTEN_GRINDING_HEAD.getStack());
|
OreUtil.registerOre("craftingTungstenGrinder", TRContent.Parts.TUNGSTEN_GRINDING_HEAD.getStack());
|
||||||
OreUtil.registerOre("craftingSuperconductor", TRIngredients.Parts.SUPERCONDUCTOR.getStack());
|
OreUtil.registerOre("craftingSuperconductor", TRContent.Parts.SUPERCONDUCTOR.getStack());
|
||||||
OreUtil.registerOre("materialResin", TRIngredients.Parts.SAP.getStack());
|
OreUtil.registerOre("materialResin", TRContent.Parts.SAP.getStack());
|
||||||
OreUtil.registerOre("materialRubber", TRIngredients.Parts.RUBBER.getStack());
|
OreUtil.registerOre("materialRubber", TRContent.Parts.RUBBER.getStack());
|
||||||
OreUtil.registerOre("itemRubber", TRIngredients.Parts.RUBBER.getStack());
|
OreUtil.registerOre("itemRubber", TRContent.Parts.RUBBER.getStack());
|
||||||
|
|
||||||
// Frames
|
// Frames
|
||||||
OreUtil.registerOre("machineBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
OreUtil.registerOre("machineBasic", new ItemStack(ModBlocks.MACHINE_BLOCK_BASIC));
|
||||||
|
@ -79,8 +79,8 @@ public class OreDict {
|
||||||
OreUtil.registerOre("machineBlockElite", new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
|
OreUtil.registerOre("machineBlockElite", new ItemStack(ModBlocks.MACHINE_BLOCK_ELITE));
|
||||||
|
|
||||||
// Tools&Armor
|
// Tools&Armor
|
||||||
OreUtil.registerOre("reBattery", TRItems.RE_BATTERY);
|
OreUtil.registerOre("reBattery", TRItems.RECHARGEABLE_BATTERY);
|
||||||
OreUtil.registerOre("lapotronCrystal", TRItems.LAPOTRONIC_CRYSTAL);
|
OreUtil.registerOre("lapotronCrystal", TRItems.LAPOTRON_CRYSTAL);
|
||||||
OreUtil.registerOre("energyCrystal", TRItems.ENERGY_CRYSTAL);
|
OreUtil.registerOre("energyCrystal", TRItems.ENERGY_CRYSTAL);
|
||||||
OreUtil.registerOre("drillBasic", TRItems.STEEL_DRILL);
|
OreUtil.registerOre("drillBasic", TRItems.STEEL_DRILL);
|
||||||
OreUtil.registerOre("drillDiamond", TRItems.DIAMOND_DRILL);
|
OreUtil.registerOre("drillDiamond", TRItems.DIAMOND_DRILL);
|
||||||
|
@ -93,7 +93,7 @@ public class OreDict {
|
||||||
OreUtil.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
|
OreUtil.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
|
||||||
OreUtil.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
|
OreUtil.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
|
||||||
OreUtil.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold"));
|
OreUtil.registerOre("insulatedGoldCableItem", BlockCable.getCableByName("insulatedgold"));
|
||||||
OreUtil.registerOre("pulpWood", TRIngredients.Dusts.SAW.getStack());
|
OreUtil.registerOre("pulpWood", TRContent.Dusts.SAW.getStack());
|
||||||
|
|
||||||
//OreUtil.registerOre("uran235", nothing);
|
//OreUtil.registerOre("uran235", nothing);
|
||||||
//OreUtil.registerOre("uran238", nothing);
|
//OreUtil.registerOre("uran238", nothing);
|
||||||
|
|
|
@ -1,431 +1,432 @@
|
||||||
/*
|
package techreborn.init;
|
||||||
* This file is part of TechReborn, licensed under the MIT License (MIT).
|
|
||||||
*
|
import net.minecraft.block.Block;
|
||||||
* Copyright (c) 2018 TechReborn
|
import net.minecraft.block.state.IBlockState;
|
||||||
*
|
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
import net.minecraft.item.Item;
|
||||||
* in the Software without restriction, including without limitation the rights
|
import net.minecraft.item.ItemStack;
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
import net.minecraft.util.IStringSerializable;
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
import net.minecraft.util.ResourceLocation;
|
||||||
* furnished to do so, subject to the following conditions:
|
import net.minecraftforge.client.model.ModelLoader;
|
||||||
*
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
* copies or substantial portions of the Software.
|
import reborncore.RebornRegistry;
|
||||||
*
|
import reborncore.api.tile.IUpgrade;
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
import reborncore.common.powerSystem.TilePowerAcceptor;
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
import reborncore.common.registration.RebornRegister;
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
import reborncore.common.registration.impl.ConfigRegistry;
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
import techreborn.TechReborn;
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
import techreborn.blocks.BlockOre;
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
import techreborn.blocks.BlockStorage;
|
||||||
* SOFTWARE.
|
import techreborn.items.ItemUpgrade;
|
||||||
*/
|
import techreborn.utils.InitUtils;
|
||||||
|
|
||||||
package techreborn.init;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
@RebornRegister(modID = TechReborn.MOD_ID)
|
||||||
import net.minecraft.block.state.IBlockState;
|
public class TRContent {
|
||||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
|
||||||
import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
|
public static void registerBlocks() {
|
||||||
import net.minecraft.item.Item;
|
Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
|
||||||
import net.minecraft.item.ItemStack;
|
Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
|
||||||
import net.minecraft.util.IStringSerializable;
|
}
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
import net.minecraftforge.client.model.ModelLoader;
|
public static void registerItems() {
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import reborncore.RebornRegistry;
|
Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import techreborn.blocks.BlockOre;
|
Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import techreborn.blocks.BlockStorage;
|
Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import techreborn.events.TRRecipeHandler;
|
Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import techreborn.items.ItemTR;
|
Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import techreborn.lib.ModInfo;
|
|
||||||
|
Arrays.stream(Upgrades.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
||||||
import java.util.Arrays;
|
}
|
||||||
|
|
||||||
/**
|
@SideOnly(Side.CLIENT)
|
||||||
* @author drcrazy
|
public static void registerModel() {
|
||||||
*/
|
ResourceLocation dustsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/dust");
|
||||||
public class TRIngredients {
|
Arrays.stream(Dusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
|
new ModelResourceLocation(dustsRL, "type=" + value.name)));
|
||||||
public static void registerBlocks() {
|
|
||||||
Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
|
ResourceLocation dustsSmallRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/small_dust");
|
||||||
Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block));
|
Arrays.stream(SmallDusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
}
|
new ModelResourceLocation(dustsSmallRL, "type=" + value.name)));
|
||||||
|
|
||||||
public static void registerItems() {
|
ResourceLocation gemsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/gem");
|
||||||
Arrays.stream(Dusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
Arrays.stream(SmallDusts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
new ModelResourceLocation(gemsRL, "type=" + value.name)));
|
||||||
Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
|
||||||
Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
ResourceLocation ingotsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/ingot");
|
||||||
Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
Arrays.stream(Parts.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
new ModelResourceLocation(ingotsRL, "type=" + value.name)));
|
||||||
Arrays.stream(Plates.values()).forEach(value -> RebornRegistry.registerItem(value.item));
|
|
||||||
}
|
ResourceLocation nuggetsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/nugget");
|
||||||
|
Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
@SideOnly(Side.CLIENT)
|
new ModelResourceLocation(nuggetsRL, "type=" + value.name)));
|
||||||
public static void registerModel() {
|
|
||||||
ResourceLocation dustsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/dust");
|
ResourceLocation partsRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/part");
|
||||||
Arrays.stream(Dusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
new ModelResourceLocation(dustsRL, "type=" + value.unsuffixedName)));
|
new ModelResourceLocation(partsRL, "type=" + value.name)));
|
||||||
|
|
||||||
ResourceLocation dustsSmallRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/small_dust");
|
ResourceLocation platesRL = new ResourceLocation(TechReborn.MOD_ID, "items/material/plate");
|
||||||
Arrays.stream(SmallDusts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
new ModelResourceLocation(dustsSmallRL, "type=" + value.unsuffixedName)));
|
new ModelResourceLocation(platesRL, "type=" + value.name)));
|
||||||
|
|
||||||
ResourceLocation gemsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/gem");
|
ResourceLocation oresRL = new ResourceLocation(TechReborn.MOD_ID, "ore");
|
||||||
Arrays.stream(Gems.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
for (Ores value : Ores.values()) {
|
||||||
new ModelResourceLocation(gemsRL, "type=" + value.unsuffixedName)));
|
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.name));
|
||||||
|
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
|
||||||
ResourceLocation ingotsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/ingot");
|
@Override
|
||||||
Arrays.stream(Ingots.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
|
||||||
new ModelResourceLocation(ingotsRL, "type=" + value.unsuffixedName)));
|
return new ModelResourceLocation(oresRL, "type=" + value.name);
|
||||||
|
}
|
||||||
ResourceLocation nuggetsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/nugget");
|
});
|
||||||
Arrays.stream(Nuggets.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
}
|
||||||
new ModelResourceLocation(nuggetsRL, "type=" + value.unsuffixedName)));
|
|
||||||
|
ResourceLocation storageRL = new ResourceLocation(TechReborn.MOD_ID, "storage_block");
|
||||||
ResourceLocation partsRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/part");
|
for (StorageBlocks value : StorageBlocks.values()) {
|
||||||
Arrays.stream(Parts.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.name));
|
||||||
new ModelResourceLocation(partsRL, "type=" + value.name)));
|
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
|
||||||
|
@Override
|
||||||
ResourceLocation platesRL = new ResourceLocation(ModInfo.MOD_ID, "items/material/plate");
|
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
|
||||||
Arrays.stream(Plates.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
return new ModelResourceLocation(storageRL, "type=" + value.name);
|
||||||
new ModelResourceLocation(platesRL, "type=" + value.unsuffixedName)));
|
}
|
||||||
|
});
|
||||||
ResourceLocation oresRL = new ResourceLocation(ModInfo.MOD_ID, "ore");
|
}
|
||||||
for (Ores value : Ores.values()) {
|
|
||||||
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(oresRL, "type=" + value.unsuffixedName));
|
ResourceLocation upgradeRL = new ResourceLocation(TechReborn.MOD_ID, "items/misc/upgrades");
|
||||||
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
|
Arrays.stream(Upgrades.values()).forEach(value -> ModelLoader.setCustomModelResourceLocation(value.item, 0,
|
||||||
@Override
|
new ModelResourceLocation(upgradeRL, "type=" + value.name)));
|
||||||
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
|
}
|
||||||
return new ModelResourceLocation(oresRL, "type=" + value.unsuffixedName);
|
|
||||||
}
|
public static enum Ores implements IStringSerializable {
|
||||||
});
|
BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE,
|
||||||
}
|
SPHALERITE, TIN, TUNGSTEN;
|
||||||
|
|
||||||
ResourceLocation storageRL = new ResourceLocation(ModInfo.MOD_ID, "storage_block");
|
public final String name;
|
||||||
for (StorageBlocks value : StorageBlocks.values()) {
|
public final Block block;
|
||||||
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(value.block), 0, new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName));
|
|
||||||
ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() {
|
private Ores() {
|
||||||
@Override
|
name = this.toString().toLowerCase();
|
||||||
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
|
block = new BlockOre();
|
||||||
return new ModelResourceLocation(storageRL, "type=" + value.unsuffixedName);
|
InitUtils.setupIngredient(block, name, "ore");
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
@Override
|
||||||
}
|
public String getName() {
|
||||||
|
return name;
|
||||||
public static enum Ores implements IStringSerializable {
|
}
|
||||||
BAUXITE, CINNABAR, COPPER, GALENA, IRIDIUM, LEAD, PERIDOT, PYRITE, RUBY, SAPPHIRE, SHELDONITE, SILVER, SODALITE,
|
}
|
||||||
SPHALERITE, TIN, TUNGSTEN;
|
|
||||||
|
public static enum StorageBlocks implements IStringSerializable {
|
||||||
public final String unsuffixedName;
|
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE,
|
||||||
public final String name;
|
IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY,
|
||||||
public final Block block;
|
SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC;
|
||||||
|
|
||||||
private Ores() {
|
public final String name;
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
public final Block block;
|
||||||
name = this.toString().toLowerCase() + "_ore";
|
|
||||||
block = new BlockOre();
|
private StorageBlocks() {
|
||||||
block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
name = this.toString().toLowerCase();
|
||||||
block.setTranslationKey(ModInfo.MOD_ID + ".ore." + this.toString().toLowerCase());
|
block = new BlockStorage();
|
||||||
TRRecipeHandler.hideEntry(block);
|
InitUtils.setupIngredient(block, name, "storage_block");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
public static enum Dusts implements IStringSerializable {
|
||||||
public static enum StorageBlocks implements IStringSerializable {
|
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
|
||||||
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE,
|
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
|
||||||
IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, OSMIUM, PERIDOT, PLATINUM, RED_GARNET, REFINED_IRON, RUBY,
|
FLINT, GALENA, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK,
|
||||||
SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC;
|
NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, RED_GARNET, RUBY, SALTPETER,
|
||||||
|
SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE,
|
||||||
public final String unsuffixedName;
|
YELLOW_GARNET, ZINC;
|
||||||
public final String name;
|
|
||||||
public final Block block;
|
public final String name;
|
||||||
|
public final Item item;
|
||||||
private StorageBlocks() {
|
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
private Dusts() {
|
||||||
name = this.toString().toLowerCase() + "_block";
|
name = this.toString().toLowerCase();
|
||||||
block = new BlockStorage();
|
item = new Item();
|
||||||
block.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
InitUtils.setupIngredient(item, name, "dust");
|
||||||
block.setTranslationKey(ModInfo.MOD_ID + ".storage_block." + this.toString().toLowerCase());
|
}
|
||||||
TRRecipeHandler.hideEntry(block);
|
|
||||||
}
|
public ItemStack getStack() {
|
||||||
|
return new ItemStack(item);
|
||||||
@Override
|
}
|
||||||
public String getName() {
|
|
||||||
return name;
|
public ItemStack getStack(int amount) {
|
||||||
}
|
return new ItemStack(item, amount);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static enum Dusts implements IStringSerializable {
|
@Override
|
||||||
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
|
public String getName() {
|
||||||
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
|
return name;
|
||||||
FLINT, GALENA, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE, NETHERRACK,
|
}
|
||||||
NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, RED_GARNET, RUBY, SALTPETER,
|
}
|
||||||
SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM, TUNGSTEN, UVAROVITE,
|
|
||||||
YELLOW_GARNET, ZINC;
|
public static enum SmallDusts implements IStringSerializable {
|
||||||
|
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
|
||||||
public final String unsuffixedName;
|
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
|
||||||
public final String name;
|
FLINT, GALENA, GLOWSTONE, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE,
|
||||||
public final Item item;
|
NETHERRACK, NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, REDSTONE, RED_GARNET,
|
||||||
|
RUBY, SALTPETER, SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM,
|
||||||
private Dusts() {
|
TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC;
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
|
||||||
name = this.toString().toLowerCase() + "_dust";
|
public final String name;
|
||||||
item = new ItemTR();
|
public final Item item;
|
||||||
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
|
||||||
item.setTranslationKey(ModInfo.MOD_ID + ".dust." + this.toString().toLowerCase());
|
private SmallDusts() {
|
||||||
TRRecipeHandler.hideEntry(item);
|
name = this.toString().toLowerCase();
|
||||||
}
|
item = new Item();
|
||||||
|
item.setRegistryName(new ResourceLocation(TechReborn.MOD_ID, name));
|
||||||
public ItemStack getStack() {
|
item.setTranslationKey(TechReborn.MOD_ID + ".small_dust." + this.toString().toLowerCase());
|
||||||
return new ItemStack(item);
|
}
|
||||||
}
|
|
||||||
|
public ItemStack getStack() {
|
||||||
public ItemStack getStack(int amount) {
|
return new ItemStack(item);
|
||||||
return new ItemStack(item, amount);
|
}
|
||||||
}
|
|
||||||
|
public ItemStack getStack(int amount) {
|
||||||
@Override
|
return new ItemStack(item, amount);
|
||||||
public String getName() {
|
}
|
||||||
return name;
|
|
||||||
}
|
@Override
|
||||||
}
|
public String getName() {
|
||||||
|
return name;
|
||||||
public static enum SmallDusts implements IStringSerializable {
|
}
|
||||||
ALMANDINE, ALUMINUM, ANDESITE, ANDRADITE, ASHES, BASALT, BAUXITE, BRASS, BRONZE, CALCITE, CHARCOAL, CHROME,
|
}
|
||||||
CINNABAR, CLAY, COAL, COPPER, DARK_ASHES, DIAMOND, DIORITE, ELECTRUM, EMERALD, ENDER_EYE, ENDER_PEARL, ENDSTONE,
|
|
||||||
FLINT, GALENA, GLOWSTONE, GOLD, GRANITE, GROSSULAR, INVAR, IRON, LAZURITE, LEAD, MAGNESIUM, MANGANESE, MARBLE,
|
public static enum Gems implements IStringSerializable {
|
||||||
NETHERRACK, NICKEL, OBSIDIAN, OLIVINE, PERIDOT, PHOSPHOROUS, PLATINUM, PYRITE, PYROPE, REDSTONE, RED_GARNET,
|
PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET;
|
||||||
RUBY, SALTPETER, SAPPHIRE, SAW, SILVER, SODALITE, SPESSARTINE, SPHALERITE, STEEL, SULFUR, TIN, TITANIUM,
|
|
||||||
TUNGSTEN, UVAROVITE, YELLOW_GARNET, ZINC;
|
public final String name;
|
||||||
|
public final Item item;
|
||||||
public final String unsuffixedName;
|
|
||||||
public final String name;
|
private Gems() {
|
||||||
public final Item item;
|
name = this.toString().toLowerCase();
|
||||||
|
item = new Item();
|
||||||
private SmallDusts() {
|
InitUtils.setupIngredient(item, name, "gem");
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
}
|
||||||
name = this.toString().toLowerCase() + "_small_dust";
|
|
||||||
item = new ItemTR();
|
public ItemStack getStack() {
|
||||||
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
return new ItemStack(item);
|
||||||
item.setTranslationKey(ModInfo.MOD_ID + ".small_dust." + this.toString().toLowerCase());
|
}
|
||||||
TRRecipeHandler.hideEntry(item);
|
|
||||||
}
|
public ItemStack getStack(int amount) {
|
||||||
|
return new ItemStack(item, amount);
|
||||||
public ItemStack getStack() {
|
}
|
||||||
return new ItemStack(item);
|
|
||||||
}
|
@Override
|
||||||
|
public String getName() {
|
||||||
public ItemStack getStack(int amount) {
|
return name;
|
||||||
return new ItemStack(item, amount);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public static enum Ingots implements IStringSerializable {
|
||||||
public String getName() {
|
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM,
|
||||||
return name;
|
LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
|
||||||
}
|
|
||||||
}
|
public final String name;
|
||||||
|
public final Item item;
|
||||||
public static enum Gems implements IStringSerializable {
|
|
||||||
PERIDOT, RED_GARNET, RUBY, SAPPHIRE, YELLOW_GARNET;
|
private Ingots() {
|
||||||
|
name = this.toString().toLowerCase();
|
||||||
public final String unsuffixedName;
|
item = new Item();
|
||||||
public final String name;
|
InitUtils.setupIngredient(item, name, "ingot");
|
||||||
public final Item item;
|
}
|
||||||
|
|
||||||
private Gems() {
|
public ItemStack getStack() {
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
return new ItemStack(item);
|
||||||
name = this.toString().toLowerCase() + "_gem";
|
}
|
||||||
item = new ItemTR();
|
|
||||||
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
public ItemStack getStack(int amount) {
|
||||||
item.setTranslationKey(ModInfo.MOD_ID + ".gem." + this.toString().toLowerCase());
|
return new ItemStack(item, amount);
|
||||||
TRRecipeHandler.hideEntry(item);
|
}
|
||||||
}
|
|
||||||
|
@Override
|
||||||
public ItemStack getStack() {
|
public String getName() {
|
||||||
return new ItemStack(item);
|
return name;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public ItemStack getStack(int amount) {
|
|
||||||
return new ItemStack(item, amount);
|
public static enum Nuggets implements IStringSerializable {
|
||||||
}
|
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL,
|
||||||
|
PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
|
||||||
@Override
|
|
||||||
public String getName() {
|
public final String name;
|
||||||
return name;
|
public final Item item;
|
||||||
}
|
|
||||||
}
|
private Nuggets() {
|
||||||
|
name = this.toString().toLowerCase();
|
||||||
public static enum Ingots implements IStringSerializable {
|
item = new Item();
|
||||||
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, COPPER, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM_ALLOY, IRIDIUM,
|
InitUtils.setupIngredient(item, name, "nugget");
|
||||||
LEAD, MIXED_METAL, NICKEL, PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
|
}
|
||||||
|
|
||||||
public final String unsuffixedName;
|
public ItemStack getStack() {
|
||||||
public final String name;
|
return new ItemStack(item);
|
||||||
public final Item item;
|
}
|
||||||
|
|
||||||
private Ingots() {
|
public ItemStack getStack(int amount) {
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
return new ItemStack(item, amount);
|
||||||
name = this.toString().toLowerCase() + "_ingot";
|
}
|
||||||
item = new ItemTR();
|
|
||||||
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
@Override
|
||||||
item.setTranslationKey(ModInfo.MOD_ID + ".ingot." + this.toString().toLowerCase());
|
public String getName() {
|
||||||
TRRecipeHandler.hideEntry(item);
|
return name;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
public ItemStack getStack() {
|
|
||||||
return new ItemStack(item);
|
public static enum Parts implements IStringSerializable {
|
||||||
}
|
CARBON_FIBER,
|
||||||
|
CARBON_MESH,
|
||||||
public ItemStack getStack(int amount) {
|
|
||||||
return new ItemStack(item, amount);
|
ELECTRONIC_CIRCUIT,
|
||||||
}
|
ADVANCED_CIRCUIT,
|
||||||
|
INDUSTRIAL_CIRCUIT,
|
||||||
@Override
|
|
||||||
public String getName() {
|
MACHINE_PARTS,
|
||||||
return name;
|
DIGITAL_DISPLAY,
|
||||||
}
|
|
||||||
}
|
DATA_STORAGE_CORE,
|
||||||
|
DATA_STORAGE_CHIP,
|
||||||
public static enum Nuggets implements IStringSerializable {
|
ENERGY_FLOW_CHIP,
|
||||||
ALUMINUM, BRASS, BRONZE, CHROME, COPPER, DIAMOND, ELECTRUM, HOT_TUNGSTENSTEEL, INVAR, IRIDIUM, LEAD, NICKEL,
|
SUPERCONDUCTOR,
|
||||||
PLATINUM, REFINED_IRON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, ZINC;
|
|
||||||
|
DIAMOND_SAW_BLADE,
|
||||||
public final String unsuffixedName;
|
DIAMOND_GRINDING_HEAD,
|
||||||
public final String name;
|
TUNGSTEN_GRINDING_HEAD,
|
||||||
public final Item item;
|
|
||||||
|
CUPRONICKEL_HEATING_COIL,
|
||||||
private Nuggets() {
|
KANTHAL_HEATING_COIL,
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
NICHROME_HEATING_COIL,
|
||||||
name = this.toString().toLowerCase() + "_nugget";
|
|
||||||
item = new ItemTR();
|
NEUTRON_REFLECTOR,
|
||||||
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
THICK_NEUTRON_REFLECTOR,
|
||||||
item.setTranslationKey(ModInfo.MOD_ID + ".nugget." + this.toString().toLowerCase());
|
IRIDIUM_NEUTRON_REFLECTOR
|
||||||
TRRecipeHandler.hideEntry(item);
|
|
||||||
}
|
//java vars can't start with numbers, so these get suffixes
|
||||||
|
, WATER_COOLANT_CELL_10K,
|
||||||
public ItemStack getStack() {
|
WATER_COOLANT_CELL_30K,
|
||||||
return new ItemStack(item);
|
WATER_COOLANT_CELL_60K,
|
||||||
}
|
HELIUM_COOLANT_CELL_60K,
|
||||||
|
HELIUM_COOLANT_CELL_360K,
|
||||||
public ItemStack getStack(int amount) {
|
HELIUM_COOLANT_CELL_180K,
|
||||||
return new ItemStack(item, amount);
|
NAK_COOLANT_CELL_60K,
|
||||||
}
|
NAK_COOLANT_CELL_180K,
|
||||||
|
NAK_COOLANT_CELL_360K,
|
||||||
@Override
|
|
||||||
public String getName() {
|
RUBBER,
|
||||||
return name;
|
SAP,
|
||||||
}
|
SCRAP,
|
||||||
}
|
UU_MATTER;
|
||||||
|
|
||||||
public static enum Parts implements IStringSerializable {
|
public final String name;
|
||||||
CARBON_FIBER,
|
public final Item item;
|
||||||
CARBON_MESH,
|
|
||||||
|
private Parts() {
|
||||||
ELECTRONIC_CIRCUIT,
|
name = this.toString().toLowerCase();
|
||||||
ADVANCED_CIRCUIT,
|
item = new Item();
|
||||||
INDUSTRIAL_CIRCUIT,
|
InitUtils.setup(item, name);
|
||||||
|
}
|
||||||
MACHINE_PARTS,
|
|
||||||
DIGITAL_DISPLAY,
|
public ItemStack getStack() {
|
||||||
|
return new ItemStack(item);
|
||||||
DATA_STORAGE_CORE,
|
}
|
||||||
DATA_STORAGE_CHIP,
|
|
||||||
ENERGY_FLOW_CHIP,
|
public ItemStack getStack(int amount) {
|
||||||
SUPERCONDUCTOR,
|
return new ItemStack(item, amount);
|
||||||
|
}
|
||||||
DIAMOND_SAW_BLADE,
|
|
||||||
DIAMOND_GRINDING_HEAD,
|
@Override
|
||||||
TUNGSTEN_GRINDING_HEAD,
|
public String getName() {
|
||||||
|
return name;
|
||||||
CUPRONICKEL_HEATING_COIL,
|
}
|
||||||
KANTHAL_HEATING_COIL,
|
}
|
||||||
NICHROME_HEATING_COIL,
|
|
||||||
|
public static enum Plates implements IStringSerializable {
|
||||||
NEUTRON_REFLECTOR,
|
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CARBON, COAL, COPPER, DIAMOND, ELECTRUM, EMERALD, GOLD, INVAR,
|
||||||
THICK_NEUTRON_REFLECTOR,
|
IRIDIUM_ALLOY, IRIDIUM, IRON, LAPIS, LAZURITE, LEAD, MAGNALIUM, NICKEL, OBSIDIAN, PERIDOT, PLATINUM, RED_GARNET,
|
||||||
IRIDIUM_NEUTRON_REFLECTOR
|
REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD,
|
||||||
|
YELLOW_GARNET, ZINC;
|
||||||
//java vars can't start with numbers, so these get suffixes
|
|
||||||
, WATER_COOLANT_CELL_10K,
|
public final String name;
|
||||||
WATER_COOLANT_CELL_30K,
|
public final Item item;
|
||||||
WATER_COOLANT_CELL_60K,
|
|
||||||
HELIUM_COOLANT_CELL_60K,
|
private Plates() {
|
||||||
HELIUM_COOLANT_CELL_360K,
|
name = this.toString().toLowerCase();
|
||||||
HELIUM_COOLANT_CELL_180K,
|
item = new Item();
|
||||||
NAK_COOLANT_CELL_60K,
|
InitUtils.setupIngredient(item, name, "plate");
|
||||||
NAK_COOLANT_CELL_180K,
|
}
|
||||||
NAK_COOLANT_CELL_360K,
|
|
||||||
|
public ItemStack getStack() {
|
||||||
RUBBER,
|
return new ItemStack(item);
|
||||||
SAP,
|
}
|
||||||
SCRAP,
|
|
||||||
UU_MATTER;
|
public ItemStack getStack(int amount) {
|
||||||
|
return new ItemStack(item, amount);
|
||||||
public final String name;
|
}
|
||||||
public final Item item;
|
|
||||||
|
@Override
|
||||||
private Parts() {
|
public String getName() {
|
||||||
name = this.toString().toLowerCase();
|
return name;
|
||||||
item = new ItemTR();
|
}
|
||||||
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
}
|
||||||
item.setTranslationKey(ModInfo.MOD_ID + ".part." + this.toString().toLowerCase());
|
|
||||||
TRRecipeHandler.hideEntry(item);
|
@ConfigRegistry(config = "items", category = "upgrades", key = "overclcoker_speed", comment = "Overclocker behavior speed multipiler")
|
||||||
}
|
public static double overclockerSpeed = 0.25;
|
||||||
|
|
||||||
public ItemStack getStack() {
|
@ConfigRegistry(config = "items", category = "upgrades", key = "overclcoker_power", comment = "Overclocker behavior power multipiler")
|
||||||
return new ItemStack(item);
|
public static double overclockerPower = 0.75;
|
||||||
}
|
|
||||||
|
@ConfigRegistry(config = "items", category = "upgrades", key = "energy_storage", comment = "Energy storage behavior extra power")
|
||||||
public ItemStack getStack(int amount) {
|
public static double energyStoragePower = 40_000;
|
||||||
return new ItemStack(item, amount);
|
|
||||||
}
|
public static enum Upgrades {
|
||||||
|
OVERCLOCKER((tile, handler, stack) -> {
|
||||||
@Override
|
TilePowerAcceptor powerAcceptor = null;
|
||||||
public String getName() {
|
if (tile instanceof TilePowerAcceptor) {
|
||||||
return name;
|
powerAcceptor = (TilePowerAcceptor) tile;
|
||||||
}
|
}
|
||||||
}
|
handler.addSpeedMulti(overclockerSpeed);
|
||||||
|
handler.addPowerMulti(overclockerPower);
|
||||||
public static enum Plates implements IStringSerializable {
|
if (powerAcceptor != null) {
|
||||||
ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CARBON, COAL, COPPER, DIAMOND, ELECTRUM, EMERALD, GOLD, INVAR,
|
powerAcceptor.extraPowerInput += powerAcceptor.getMaxInput();
|
||||||
IRIDIUM_ALLOY, IRIDIUM, IRON, LAPIS, LAZURITE, LEAD, MAGNALIUM, NICKEL, OBSIDIAN, PERIDOT, PLATINUM, RED_GARNET,
|
powerAcceptor.extraPowerStoage += powerAcceptor.getBaseMaxPower();
|
||||||
REDSTONE, REFINED_IRON, RUBY, SAPPHIRE, SILICON, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, WOOD,
|
}
|
||||||
YELLOW_GARNET, ZINC;
|
}),
|
||||||
|
TRANSFORMER((tile, handler, stack) -> {
|
||||||
public final String unsuffixedName;
|
TilePowerAcceptor powerAcceptor = null;
|
||||||
public final String name;
|
if (tile instanceof TilePowerAcceptor) {
|
||||||
public final Item item;
|
powerAcceptor = (TilePowerAcceptor) tile;
|
||||||
|
}
|
||||||
private Plates() {
|
if (powerAcceptor != null) {
|
||||||
unsuffixedName = this.toString().toLowerCase();
|
powerAcceptor.extraTier += 1;
|
||||||
name = this.toString().toLowerCase() + "_plate";
|
}
|
||||||
item = new ItemTR();
|
}),
|
||||||
item.setRegistryName(new ResourceLocation(ModInfo.MOD_ID, name));
|
ENERGY_STORAGE((tile, handler, stack) -> {
|
||||||
item.setTranslationKey(ModInfo.MOD_ID + ".plate." + this.toString().toLowerCase());
|
TilePowerAcceptor powerAcceptor = null;
|
||||||
TRRecipeHandler.hideEntry(item);
|
if (tile instanceof TilePowerAcceptor) {
|
||||||
}
|
powerAcceptor = (TilePowerAcceptor) tile;
|
||||||
|
}
|
||||||
public ItemStack getStack() {
|
if (powerAcceptor != null) {
|
||||||
return new ItemStack(item);
|
powerAcceptor.extraPowerStoage += energyStoragePower;
|
||||||
}
|
}
|
||||||
|
});
|
||||||
public ItemStack getStack(int amount) {
|
|
||||||
return new ItemStack(item, amount);
|
public String name;
|
||||||
}
|
public Item item;
|
||||||
|
|
||||||
@Override
|
Upgrades(IUpgrade upgrade) {
|
||||||
public String getName() {
|
name = this.toString().toLowerCase();
|
||||||
return name;
|
item = new ItemUpgrade(name, upgrade);
|
||||||
}
|
InitUtils.setupIngredient(item, name, "_upgrade");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue