Refactoring & cleaning

This commit is contained in:
ProfessorProspector 2018-09-16 13:48:38 -07:00
parent 874559c21e
commit e5736669ca
200 changed files with 1382 additions and 1596 deletions

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileAlloySmelter;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockAlloySmelter extends BlockMachineBase {
public BlockAlloySmelter() {
super();
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

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileAssemblingMachine;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockAssemblingMachine extends BlockMachineBase {
public BlockAssemblingMachine() {
super();
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

View file

@ -32,8 +32,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileAutoCraftingTable;
import techreborn.utils.TechRebornCreativeTab;
@ -43,7 +43,7 @@ public class BlockAutoCraftingTable extends BlockMachineBase {
super(true);
setTranslationKey("techreborn.electriccraftingtable");
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

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileCompressor;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockCompressor extends BlockMachineBase {
public BlockCompressor() {
super();
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

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileElectricFurnace;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockElectricFurnace extends BlockMachineBase {
public BlockElectricFurnace() {
super();
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

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileExtractor;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockExtractor extends BlockMachineBase {
public BlockExtractor() {
super();
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

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileGrinder;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockGrinder extends BlockMachineBase {
public BlockGrinder() {
super();
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

View file

@ -56,9 +56,9 @@ import reborncore.common.blocks.PropertyString;
import reborncore.common.util.ArrayUtils;
import reborncore.common.util.ChatUtils;
import reborncore.common.util.StringUtils;
import techreborn.TechReborn;
import techreborn.init.ModBlocks;
import techreborn.lib.MessageIDs;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TilePlayerDectector;
import techreborn.utils.TechRebornCreativeTab;
@ -76,7 +76,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.getStateFromMeta(0));
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]));
}
}

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileRecycler;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockRecycler extends BlockMachineBase {
public BlockRecycler() {
super();
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

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileRollingMachine;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockRollingMachine extends BlockMachineBase {
public BlockRollingMachine() {
super();
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

View file

@ -30,8 +30,8 @@ import reborncore.api.tile.IMachineGuiHandler;
import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.client.EGui;
import techreborn.lib.ModInfo;
import techreborn.tiles.tier1.TileScrapboxinator;
import techreborn.utils.TechRebornCreativeTab;
@ -40,7 +40,7 @@ public class BlockScrapboxinator extends BlockMachineBase {
public BlockScrapboxinator() {
super();
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