Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm
This commit is contained in:
commit
2a0a9e5636
81 changed files with 2824 additions and 790 deletions
|
@ -32,7 +32,7 @@ import net.minecraft.util.ResourceLocation;
|
|||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import reborncore.RebornRegistry;
|
||||
import reborncore.common.tile.TileMachineBase;
|
||||
import reborncore.common.tile.TileLegacyMachineBase;
|
||||
import reborncore.common.util.OreUtil;
|
||||
import reborncore.common.util.StringUtils;
|
||||
import techreborn.Core;
|
||||
|
@ -350,7 +350,7 @@ public class ModBlocks {
|
|||
registerBlock(WIND_MILL, "wind_mill");
|
||||
GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMillTR");
|
||||
|
||||
GameRegistry.registerTileEntity(TileMachineBase.class, "TileMachineBaseTR");
|
||||
GameRegistry.registerTileEntity(TileLegacyMachineBase.class, "TileMachineBaseTR");
|
||||
|
||||
RUBBER_LOG = new BlockRubberLog();
|
||||
registerBlock(RUBBER_LOG, "rubber_log");
|
||||
|
|
|
@ -219,6 +219,16 @@ public class ModRecipes {
|
|||
new ItemStack(Items.ENDER_PEARL),
|
||||
ItemDusts.getDustByName("ender_pearl", 2),
|
||||
200, 22));
|
||||
|
||||
RecipeHandler.addRecipe(new GrinderRecipe(
|
||||
new ItemStack(Blocks.LAPIS_ORE),
|
||||
new ItemStack(Items.DYE, 10, 4),
|
||||
170, 19));
|
||||
|
||||
RecipeHandler.addRecipe(new GrinderRecipe(
|
||||
new ItemStack(Blocks.OBSIDIAN),
|
||||
ItemDusts.getDustByName("obsidian", 4),
|
||||
170, 19));
|
||||
|
||||
for (String oreDictionaryName : OreDictionary.getOreNames()) {
|
||||
if (isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) {
|
||||
|
|
|
@ -40,11 +40,7 @@ import techreborn.config.ConfigTechReborn;
|
|||
import techreborn.init.IC2Duplicates;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.items.DynamicCell;
|
||||
import techreborn.items.ItemDustsSmall;
|
||||
import techreborn.items.ItemNuggets;
|
||||
import techreborn.items.ItemParts;
|
||||
import techreborn.items.ItemUpgrades;
|
||||
import techreborn.items.*;
|
||||
|
||||
/**
|
||||
* Created by Prospector
|
||||
|
@ -90,8 +86,6 @@ public class CraftingTableRecipes extends RecipeMethods {
|
|||
}
|
||||
|
||||
//Upgrades
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("injection"), "CHC", "PSP", "PPP", 'S', "chestWood", 'C', "circuitBasic", 'P', "plateIron", 'H', getStack(Blocks.HOPPER));
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("ejection"), "CSC", "PHP", "PPP", 'S', "chestWood", 'C', "circuitBasic", 'P', "plateIron", 'H', getStack(Blocks.HOPPER));
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("energy_storage"), "PPP", "WBW", "PCP", 'P', "plankWood", 'W', getStack(IC2Duplicates.CABLE_ICOPPER), 'C', "circuitBasic", 'B', "reBattery");
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("overclock"), "TTT", "WCW", 'T', getMaterial("coolant_simple", Type.PART), 'W', getStack(IC2Duplicates.CABLE_ICOPPER), 'C', "circuitBasic");
|
||||
registerShaped(ItemUpgrades.getUpgradeByName("overclock", 2), " T ", "WCW", 'T', getMaterial("helium_coolant_triple", Type.PART), 'W', getStack(IC2Duplicates.CABLE_ICOPPER), 'C', "circuitBasic");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue