Merge remote-tracking branch 'origin/1.14' into 1.14.4
This commit is contained in:
commit
09662db11a
15 changed files with 216 additions and 20 deletions
|
@ -319,9 +319,7 @@ public class ModRecipes {
|
||||||
}
|
}
|
||||||
|
|
||||||
static void addBlastFurnaceRecipes() {
|
static void addBlastFurnaceRecipes() {
|
||||||
// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE,
|
|
||||||
// new BlastFurnaceRecipe(ItemDusts.getDustByName("titanium"), null, ItemIngots.getIngotByName("titanium"),
|
|
||||||
// null, 3600, 120, 1500));
|
|
||||||
// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE,
|
// RecipeHandler.addRecipe(Reference.BLAST_FURNACE_RECIPE,
|
||||||
// new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("titanium", 4), null,
|
// new BlastFurnaceRecipe(ItemDustsSmall.getSmallDustByName("titanium", 4), null,
|
||||||
// ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500));
|
// ItemIngots.getIngotByName("titanium"), null, 3600, 120, 1500));
|
||||||
|
|
|
@ -24,9 +24,7 @@
|
||||||
|
|
||||||
package techreborn.init.recipes;
|
package techreborn.init.recipes;
|
||||||
|
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.item.Items;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author drcrazy
|
* @author drcrazy
|
||||||
|
@ -34,12 +32,7 @@ import net.minecraft.item.Items;
|
||||||
*/
|
*/
|
||||||
public class ChemicalReactorRecipes extends RecipeMethods {
|
public class ChemicalReactorRecipes extends RecipeMethods {
|
||||||
public static void init(){
|
public static void init(){
|
||||||
register(getStack(Items.GOLD_NUGGET, 8), getStack(Items.MELON_SLICE), getStack(Items.GLISTERING_MELON_SLICE), 40);
|
|
||||||
register(getStack(Items.GOLD_NUGGET, 8), getStack(Items.CARROT), getStack(Items.GOLDEN_CARROT), 40);
|
|
||||||
register(getStack(Items.GOLD_INGOT, 8), getStack(Items.APPLE), getStack(Items.GOLDEN_APPLE), 40);
|
|
||||||
register(getStack(Blocks.GOLD_BLOCK, 8), getStack(Items.APPLE, 1), getStack(Items.GOLDEN_APPLE), 100);
|
|
||||||
register(getStack(Items.BLAZE_POWDER), getStack(Items.SLIME_BALL), getStack(Items.MAGMA_CREAM), 40);
|
|
||||||
register(getStack(Items.BLAZE_POWDER), getStack(Items.ENDER_PEARL), getStack(Items.ENDER_EYE), 40);
|
|
||||||
|
|
||||||
//Cells recipes. One cell should be cooked in 20 seconds
|
//Cells recipes. One cell should be cooked in 20 seconds
|
||||||
register(getMaterial("carbon", Type.CELL), getMaterial("calcium", Type.CELL), getMaterial("calciumCarbonate", 2, Type.CELL), 800);
|
register(getMaterial("carbon", Type.CELL), getMaterial("calcium", Type.CELL), getMaterial("calciumCarbonate", 2, Type.CELL), 800);
|
||||||
|
|
|
@ -36,7 +36,7 @@ import java.security.InvalidParameterException;
|
||||||
*/
|
*/
|
||||||
public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
public class IndustrialCentrifugeRecipes extends RecipeMethods {
|
||||||
public static void init() {
|
public static void init() {
|
||||||
register(getStack(Items.MAGMA_CREAM), 500, getStack(Items.BLAZE_POWDER), getStack(Items.SLIME_BALL));
|
|
||||||
register(getStack(Blocks.DIRT, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2));
|
register(getStack(Blocks.DIRT, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2));
|
||||||
register(getStack(Blocks.GRASS, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2), getStack(Items.WHEAT_SEEDS, 4));
|
register(getStack(Blocks.GRASS, 16), 2500, getStack(Blocks.SAND, 8), getStack(Items.CLAY_BALL), getStack(Blocks.GRAVEL, 2), getStack(Items.WHEAT_SEEDS, 4));
|
||||||
register(getStack(Blocks.MYCELIUM, 8), 1640, getStack(Blocks.SAND, 4), getStack(Items.CLAY_BALL), getStack(Blocks.BROWN_MUSHROOM, 2), getStack(Blocks.RED_MUSHROOM, 2));
|
register(getStack(Blocks.MYCELIUM, 8), 1640, getStack(Blocks.SAND, 4), getStack(Items.CLAY_BALL), getStack(Blocks.BROWN_MUSHROOM, 2), getStack(Blocks.RED_MUSHROOM, 2));
|
||||||
|
|
|
@ -12,6 +12,7 @@ import net.minecraft.item.Items;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import reborncore.common.crafting.RebornRecipe;
|
import reborncore.common.crafting.RebornRecipe;
|
||||||
import reborncore.common.crafting.RebornRecipeType;
|
import reborncore.common.crafting.RebornRecipeType;
|
||||||
|
import reborncore.common.util.StringUtils;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
@ -34,7 +35,7 @@ public class MachineRecipeCategory<R extends RebornRecipe> implements RecipeCate
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getCategoryName() {
|
public String getCategoryName() {
|
||||||
return rebornRecipeType.getName().toString();
|
return StringUtils.t(rebornRecipeType.getName().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -3,13 +3,15 @@ package techreborn.rei;
|
||||||
import me.shedaniel.rei.api.REIPluginEntry;
|
import me.shedaniel.rei.api.REIPluginEntry;
|
||||||
import me.shedaniel.rei.api.RecipeHelper;
|
import me.shedaniel.rei.api.RecipeHelper;
|
||||||
import net.minecraft.item.ItemConvertible;
|
import net.minecraft.item.ItemConvertible;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.recipe.Recipe;
|
import net.minecraft.recipe.Recipe;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import reborncore.common.crafting.RebornRecipe;
|
import reborncore.common.crafting.RebornRecipe;
|
||||||
import reborncore.common.crafting.RebornRecipeType;
|
import reborncore.common.crafting.RebornRecipeType;
|
||||||
import reborncore.common.crafting.RecipeManager;
|
import reborncore.common.crafting.RecipeManager;
|
||||||
|
import techreborn.TechReborn;
|
||||||
import techreborn.init.ModRecipes;
|
import techreborn.init.ModRecipes;
|
||||||
import techreborn.init.TRContent;
|
import techreborn.init.TRContent.Machine;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -17,13 +19,16 @@ import java.util.function.Predicate;
|
||||||
|
|
||||||
public class ReiPlugin implements REIPluginEntry {
|
public class ReiPlugin implements REIPluginEntry {
|
||||||
|
|
||||||
public static final Identifier PLUGIN = new Identifier("techreborn", "techreborn_plugin");
|
public static final Identifier PLUGIN = new Identifier(TechReborn.MOD_ID, "techreborn_plugin");
|
||||||
|
|
||||||
public static final Map<RebornRecipeType<?>, ItemConvertible> iconMap = new HashMap<>();
|
public static final Map<RebornRecipeType<?>, ItemConvertible> iconMap = new HashMap<>();
|
||||||
|
|
||||||
public ReiPlugin() {
|
public ReiPlugin() {
|
||||||
iconMap.put(ModRecipes.ALLOY_SMELTER, TRContent.Machine.ALLOY_SMELTER);
|
iconMap.put(ModRecipes.ALLOY_SMELTER, Machine.ALLOY_SMELTER);
|
||||||
iconMap.put(ModRecipes.GRINDER, TRContent.Machine.GRINDER);
|
iconMap.put(ModRecipes.GRINDER, Machine.GRINDER);
|
||||||
|
iconMap.put(ModRecipes.BLAST_FURNACE, Machine.INDUSTRIAL_BLAST_FURNACE);
|
||||||
|
iconMap.put(ModRecipes.CENTRIFUGE, Machine.INDUSTRIAL_CENTRIFUGE);
|
||||||
|
iconMap.put(ModRecipes.CHEMICAL_REACTOR, Machine.CHEMICAL_REACTOR);
|
||||||
//TODO add the others here
|
//TODO add the others here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,12 +47,23 @@ public class ReiPlugin implements REIPluginEntry {
|
||||||
RecipeManager.getRecipeTypes("techreborn").forEach(rebornRecipeType -> registerMachineRecipe(recipeHelper, rebornRecipeType));
|
RecipeManager.getRecipeTypes("techreborn").forEach(rebornRecipeType -> registerMachineRecipe(recipeHelper, rebornRecipeType));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerOthers(RecipeHelper recipeHelper) {
|
||||||
|
recipeHelper.registerWorkingStations(ModRecipes.ALLOY_SMELTER.getName(),
|
||||||
|
new ItemStack[] { new ItemStack(Machine.ALLOY_SMELTER.asItem()),
|
||||||
|
new ItemStack(Machine.IRON_ALLOY_FURNACE.asItem())});
|
||||||
|
recipeHelper.registerWorkingStations(ModRecipes.GRINDER.getName(), new ItemStack(Machine.GRINDER.asItem()));
|
||||||
|
recipeHelper.registerWorkingStations(ModRecipes.BLAST_FURNACE.getName(), new ItemStack(Machine.INDUSTRIAL_BLAST_FURNACE.asItem()));
|
||||||
|
recipeHelper.registerWorkingStations(ModRecipes.CENTRIFUGE.getName(), new ItemStack(Machine.INDUSTRIAL_CENTRIFUGE.asItem()));
|
||||||
|
recipeHelper.registerWorkingStations(ModRecipes.CHEMICAL_REACTOR.getName(), new ItemStack(Machine.CHEMICAL_REACTOR.asItem()));
|
||||||
|
}
|
||||||
|
|
||||||
private <R extends RebornRecipe> void registerMachineRecipe(RecipeHelper recipeHelper, RebornRecipeType<R> recipeType){
|
private <R extends RebornRecipe> void registerMachineRecipe(RecipeHelper recipeHelper, RebornRecipeType<R> recipeType){
|
||||||
recipeHelper.registerRecipes(recipeType.getName(), (Predicate<Recipe>) recipe -> {
|
recipeHelper.registerRecipes(recipeType.getName(), (Predicate<Recipe>) recipe -> {
|
||||||
if (recipe instanceof RebornRecipe) {
|
if (recipe instanceof RebornRecipe) {
|
||||||
return ((RebornRecipe) recipe).getRebornRecipeType() == recipeType;
|
return ((RebornRecipe) recipe).getRebornRecipeType() == recipeType;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}, recipe -> new MachineRecipeDisplay((RebornRecipe) recipe));
|
}, recipe -> new MachineRecipeDisplay<RebornRecipe>((RebornRecipe) recipe));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -631,5 +631,24 @@
|
||||||
"advancements.techreborn.treetap": "TreeTap",
|
"advancements.techreborn.treetap": "TreeTap",
|
||||||
"advancements.techreborn.treetap.desc": "Now that you have crafted a tree tap you will want to use it on a sap spot on a rubber tree.",
|
"advancements.techreborn.treetap.desc": "Now that you have crafted a tree tap you will want to use it on a sap spot on a rubber tree.",
|
||||||
"advancements.techreborn.sap": "Rubber Sap",
|
"advancements.techreborn.sap": "Rubber Sap",
|
||||||
"advancements.techreborn.sap.desc": "Well done, you now have rubber sap. You will want to smelt it in a furnace to create rubber next."
|
"advancements.techreborn.sap.desc": "Well done, you now have rubber sap. You will want to smelt it in a furnace to create rubber next.",
|
||||||
|
|
||||||
|
"_comment25": "REI Integration",
|
||||||
|
"techreborn:alloy_smelter": "Alloy Smelter",
|
||||||
|
"techreborn:assembling_machine": "Assembling Machine",
|
||||||
|
"techreborn:blast_furnace": "Blast Furnace",
|
||||||
|
"techreborn:centrifuge": "Industrial Centrifuge",
|
||||||
|
"techreborn:chemical_reactor": "Chemical Reactor",
|
||||||
|
"techreborn:compressor": "Compressor",
|
||||||
|
"techreborn:distillation_tower": "Distillation Tower",
|
||||||
|
"techreborn:extractor": "Extrator",
|
||||||
|
"techreborn:grinder": "Grinder",
|
||||||
|
"techreborn:implosion_compressor": "Implosion Compressor",
|
||||||
|
"techreborn:industrial_electrolyzer": "Industrial Electrolyzer",
|
||||||
|
"techreborn:industrial_grinder": "Industrial Grinder",
|
||||||
|
"techreborn:industrial_sawmill": "Industrial Sawmill",
|
||||||
|
"techreborn:recycler": "Recycler",
|
||||||
|
"techreborn:scrapbox": "Scrapbox",
|
||||||
|
"techreborn:vacuum_freezer": "Vacuum Freezer",
|
||||||
|
"techreborn:fluid_replicator": "Fluid Replicator"
|
||||||
}
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:blast_furnace",
|
||||||
|
"power": 128,
|
||||||
|
"time": 3600,
|
||||||
|
"heat": 1500,
|
||||||
|
"ingredients" : [
|
||||||
|
{
|
||||||
|
"item": "techreborn:titanium_dust"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results" : [
|
||||||
|
{
|
||||||
|
"item": "techreborn:titanium_ingot"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:centrifuge",
|
||||||
|
"power": 5,
|
||||||
|
"time": 500,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:magma_cream"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:blaze_powder"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:slime_ball"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,21 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 30,
|
||||||
|
"time": 800,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"fluid": "techreborn:carbon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fluid": "techreborn:calcium"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "techreborn:cell",
|
||||||
|
"tag": {
|
||||||
|
"fluid": "techreborn:calciumcarbonate"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 30,
|
||||||
|
"time": 100,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:gold_block",
|
||||||
|
"count": 8
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:apple"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:enchanted_golden_apple"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 30,
|
||||||
|
"time": 40,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:blaze_powder"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:ender_pearl"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:ender_eye",
|
||||||
|
"count": 2
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 30,
|
||||||
|
"time": 40,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:gold_nugget",
|
||||||
|
"count": 8
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:melon_slice"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:glistering_melon_slice"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 30,
|
||||||
|
"time": 40,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:gold_nugget",
|
||||||
|
"count": 8
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:apple"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:golden_apple"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 30,
|
||||||
|
"time": 40,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:gold_nugget",
|
||||||
|
"count": 8
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:carrot"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:golden_carrot"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"type": "techreborn:chemical_reactor",
|
||||||
|
"power": 30,
|
||||||
|
"time": 40,
|
||||||
|
"ingredients": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:blaze_powder"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"item": "minecraft:slime_ball"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"results": [
|
||||||
|
{
|
||||||
|
"item": "minecraft:magma_cream",
|
||||||
|
"count": 2
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
Loading…
Reference in a new issue