Fix wrench recipe issues
Remove fluid pipe Add recipe to switch rubber Fix some missing textures
This commit is contained in:
parent
0a2e878b88
commit
edf266588f
9 changed files with 34 additions and 22 deletions
|
@ -62,7 +62,7 @@ configurations {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
version = "1.4.2"
|
version = "1.4.3"
|
||||||
|
|
||||||
def ENV = System.getenv()
|
def ENV = System.getenv()
|
||||||
if (ENV.BUILD_NUMBER) {
|
if (ENV.BUILD_NUMBER) {
|
||||||
|
@ -70,7 +70,7 @@ if (ENV.BUILD_NUMBER) {
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.10.2-12.18.1.2044"
|
version = "1.10.2-12.18.1.2084"
|
||||||
mappings = "snapshot_20160518"
|
mappings = "snapshot_20160518"
|
||||||
replace "@MODVERSION@", project.version
|
replace "@MODVERSION@", project.version
|
||||||
// makeObfSourceJar = false
|
// makeObfSourceJar = false
|
||||||
|
|
|
@ -6,9 +6,12 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||||
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
|
||||||
|
import reborncore.api.recipe.RecipeHandler;
|
||||||
import reborncore.common.util.CraftingHelper;
|
import reborncore.common.util.CraftingHelper;
|
||||||
import techreborn.compat.ICompatModule;
|
import techreborn.compat.ICompatModule;
|
||||||
import techreborn.init.ModBlocks;
|
import techreborn.init.ModBlocks;
|
||||||
|
import techreborn.init.ModItems;
|
||||||
|
import techreborn.items.ItemParts;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -36,7 +39,10 @@ public class RecipesIC2 implements ICompatModule {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void postInit(FMLPostInitializationEvent event) {
|
public void postInit(FMLPostInitializationEvent event) {
|
||||||
|
CraftingHelper.addShapelessRecipe(ItemParts.getPartByName("rubber"), IC2Items.getItem("crafting", "rubber"));
|
||||||
|
CraftingHelper.addShapelessRecipe(IC2Items.getItem("crafting", "rubber"), ItemParts.getPartByName("rubber"));
|
||||||
|
|
||||||
|
CraftingHelper.addShapelessRecipe(IC2Items.getItem("electric_wrench"), new ItemStack(ModItems.wrench), IC2Items.getItem("crafting", "small_power_unit"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -254,5 +254,7 @@ import java.util.List;
|
||||||
recipeTransferRegistry
|
recipeTransferRegistry
|
||||||
.addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1, 2, 36);
|
.addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1, 2, 36);
|
||||||
|
|
||||||
|
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.pump));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -439,7 +439,8 @@ public class ModRecipes
|
||||||
new ItemStack(Blocks.NETHERRACK),
|
new ItemStack(Blocks.NETHERRACK),
|
||||||
ItemDusts.getDustByName("netherrack"),
|
ItemDusts.getDustByName("netherrack"),
|
||||||
300, 27));
|
300, 27));
|
||||||
|
|
||||||
|
|
||||||
for(String oreDictionaryName : OreDictionary.getOreNames()) {
|
for(String oreDictionaryName : OreDictionary.getOreNames()) {
|
||||||
if(isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) {
|
if(isDictPrefixed(oreDictionaryName, "ore", "gem", "ingot")) {
|
||||||
ItemStack oreStack = getDictOreOrNull(oreDictionaryName, 1);
|
ItemStack oreStack = getDictOreOrNull(oreDictionaryName, 1);
|
||||||
|
@ -456,8 +457,11 @@ public class ModRecipes
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
boolean ore = data[0].equals("ore");
|
boolean ore = data[0].equals("ore");
|
||||||
Core.logHelper.info("Ore: " + data[1]);
|
Core.logHelper.debug("Ore: " + data[1]);
|
||||||
ItemStack dust = getDictOreOrNull(joinDictName("dust", data[1]), ore ? 2 : 1);
|
ItemStack dust = getDictOreOrNull(joinDictName("dust", data[1]), ore ? 2 : 1);
|
||||||
|
if(dust == null || dust.getItem() == null){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22));
|
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,12 +50,12 @@ public class TechRebornParts implements ICompatModule
|
||||||
cables.setRegistryName("cables");
|
cables.setRegistryName("cables");
|
||||||
GameRegistry.register(cables);
|
GameRegistry.register(cables);
|
||||||
|
|
||||||
MultipartRegistry.registerPart(EmptyFluidPipe.class, "techreborn:fluidpipe.empty");
|
// MultipartRegistry.registerPart(EmptyFluidPipe.class, "techreborn:fluidpipe.empty");
|
||||||
MultipartRegistry.registerPart(InsertingFluidPipe.class, "techreborn:fluidpipe.inserting");
|
// MultipartRegistry.registerPart(InsertingFluidPipe.class, "techreborn:fluidpipe.inserting");
|
||||||
MultipartRegistry.registerPart(ExtractingFluidPipe.class, "techreborn:fluidpipe.extracting");
|
// MultipartRegistry.registerPart(ExtractingFluidPipe.class, "techreborn:fluidpipe.extracting");
|
||||||
fluidPipe = new ItemFluidPipe();
|
// fluidPipe = new ItemFluidPipe();
|
||||||
fluidPipe.setRegistryName("fluidPipe");
|
// fluidPipe.setRegistryName("fluidPipe");
|
||||||
GameRegistry.register(fluidPipe);
|
// GameRegistry.register(fluidPipe);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -4,16 +4,16 @@
|
||||||
"transform":"forge:default-block",
|
"transform":"forge:default-block",
|
||||||
"model":"orientable",
|
"model":"orientable",
|
||||||
"textures":{
|
"textures":{
|
||||||
"particle":"techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_off",
|
"particle":"techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_off",
|
||||||
"top":"techreborn:blocks/machine/advanced_machines/machine_top",
|
"top":"techreborn:blocks/machine/advanced_machines/machine_top",
|
||||||
"side":"techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_off"
|
"side":"techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_off"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"variants":{
|
"variants":{
|
||||||
"inventory":{
|
"inventory":{
|
||||||
"transform":"forge:default-block",
|
"transform":"forge:default-block",
|
||||||
"textures":{
|
"textures":{
|
||||||
"front":"techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_off"
|
"front":"techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_off"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"facing":{
|
"facing":{
|
||||||
|
@ -33,22 +33,22 @@
|
||||||
"active":{
|
"active":{
|
||||||
"true":{
|
"true":{
|
||||||
"textures":{
|
"textures":{
|
||||||
"front":"techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_on"
|
"front":"techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_on"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"false":{
|
"false":{
|
||||||
"textures":{
|
"textures":{
|
||||||
"front":"techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_off"
|
"front":"techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_off"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"inventory": {
|
"inventory": {
|
||||||
"model": "orientable",
|
"model": "orientable",
|
||||||
"textures": {
|
"textures": {
|
||||||
"particle": "techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_off",
|
"particle": "techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_off",
|
||||||
"top": "techreborn:blocks/machine/advanced_machines/machine_top",
|
"top": "techreborn:blocks/machine/advanced_machines/machine_top",
|
||||||
"side": "techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_off",
|
"side": "techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_off",
|
||||||
"front": "techreborn:blocks/machine/advanced_machines/industrial_electrolyzer_front_off"
|
"front": "techreborn:blocks/machine/greg_machines/industrial_electrolyzer_front_off"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"model":"orientable",
|
"model":"orientable",
|
||||||
"textures":{
|
"textures":{
|
||||||
"particle": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
"particle": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
||||||
"top": "techreborn:blocks/machine/generators/lightning_rod_top",
|
"top": "techreborn:blocks/machine/greg_machines/machine_top",
|
||||||
"side": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
"side": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
||||||
"down":"techreborn:blocks/machine/generators/lightning_rod_side_off",
|
"down":"techreborn:blocks/machine/generators/lightning_rod_side_off",
|
||||||
"front":"techreborn:blocks/machine/generators/plasma_generator_front"
|
"front":"techreborn:blocks/machine/generators/plasma_generator_front"
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
"model": "orientable",
|
"model": "orientable",
|
||||||
"textures": {
|
"textures": {
|
||||||
"particle": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
"particle": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
||||||
"top": "techreborn:blocks/machine/generators/lightning_rod_top",
|
"top": "techreborn:blocks/machine/greg_machines/machine_top",
|
||||||
"side": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
"side": "techreborn:blocks/machine/generators/lightning_rod_side_off",
|
||||||
"down":"techreborn:blocks/machine/generators/lightning_rod_side_off",
|
"down":"techreborn:blocks/machine/generators/lightning_rod_side_off",
|
||||||
"front":"techreborn:blocks/machine/generators/plasma_generator_front"
|
"front":"techreborn:blocks/machine/generators/plasma_generator_front"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"parent": "techreborn:item/techrebornItem",
|
"parent": "techreborn:item/techrebornItem",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "techreborn:items/tool/energyCrystalEmpty"
|
"layer0": "techreborn:items/tool/energyCrystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"parent": "techreborn:item/techrebornItem",
|
"parent": "techreborn:item/techrebornItem",
|
||||||
"textures": {
|
"textures": {
|
||||||
"layer0": "techreborn:items/tool/lapotronCrystalEmpty"
|
"layer0": "techreborn:items/tool/lapotronCrystal"
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue