diff --git a/dependencies.gradle b/dependencies.gradle index 0f17cf9..86f6d31 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,13 +40,14 @@ dependencies { // Published dependencies api("codechicken:codechickenlib:3.2.3.358") // CCL 3.2.3.358 - api("com.cleanroommc:modularui:2.4.3") { transitive = false } // MUI 2.4.3 + api("com.cleanroommc:modularui:2.5.0-rc1") { transitive = false } // MUI 2.5.0-rc1 api("com.cleanroommc:groovyscript:1.1.1") { transitive = false } // GrS 1.1.1 api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700") // CrT 4.1.20.700 api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31 // Hard Dependencies - devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10 - devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10 - + //devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10 + devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.9.0-beta-dev.jar"))) // CEu pr 2.9.0 + //devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10 + devOnlyNonPublishable(rfg.deobf(project.files("libs/GregicalityMultiblocks-1.3.0-dev.jar"))) // GCYM pr 1.3.0 } diff --git a/libs/GregicalityMultiblocks-1.3.0-dev.jar b/libs/GregicalityMultiblocks-1.3.0-dev.jar new file mode 100644 index 0000000..0915d49 Binary files /dev/null and b/libs/GregicalityMultiblocks-1.3.0-dev.jar differ diff --git a/libs/gregtech-1.12.2-2.9.0-beta-dev.jar b/libs/gregtech-1.12.2-2.9.0-beta-dev.jar new file mode 100644 index 0000000..949e151 Binary files /dev/null and b/libs/gregtech-1.12.2-2.9.0-beta-dev.jar differ diff --git a/libs/gregtech-1.12.2-2.9.0-beta-sources.jar b/libs/gregtech-1.12.2-2.9.0-beta-sources.jar new file mode 100644 index 0000000..4250c6a Binary files /dev/null and b/libs/gregtech-1.12.2-2.9.0-beta-sources.jar differ diff --git a/src/main/java/com/github/gtexpert/inb/INBMod.java b/src/main/java/com/github/gtexpert/inb/INBMod.java index 5f8e4ec..44edefd 100644 --- a/src/main/java/com/github/gtexpert/inb/INBMod.java +++ b/src/main/java/com/github/gtexpert/inb/INBMod.java @@ -19,6 +19,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import gregtech.GTInternalTags; +import gregtech.api.GregTechAPI; +import gregtech.api.metatileentity.registry.MTEManager; import com.github.gtexpert.inb.api.INBValues; import com.github.gtexpert.inb.api.util.INBLog; @@ -30,7 +32,8 @@ name = INBValues.MODNAME, acceptedMinecraftVersions = "[1.12.2]", version = Tags.VERSION, - dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MIXINBOOTER + ";" + + dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MODULRAUI + ";" + + "required-after:" + Mods.Names.MIXINBOOTER + ";" + "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";") @Mod.EventBusSubscriber(modid = INBValues.MODID) public class INBMod { @@ -146,6 +149,11 @@ public static ItemBlock createItemBlock(T block, Function FAKE_IMPLOSION_RECIPES = new RecipeMap<>( - "fake_implosion_compressor", 3, 2, 0, 0, - new SimpleRecipeBuilder().duration(20).EUt(VA[LV]), true) - .onRecipeBuild(recipeBuilder -> { + public static final RecipeMap FAKE_IMPLOSION_RECIPES = new RecipeMapBuilder<>( + "fake_implosion_compressor", + new SimpleRecipeBuilder().duration(20).EUt(VA[LV]).hidden()) + .itemInputs(3) + .itemOutputs(2) + .fluidInputs(0) + .fluidOutputs(0) + .onBuild(gregtechId("implosion_compressor"), recipeBuilder -> { RecipeMaps.IMPLOSION_RECIPES.recipeBuilder() .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) .outputs(recipeBuilder.getOutputs()) .chancedOutputs(recipeBuilder.getChancedOutputs()) - .explosivesType(new ItemStack(MetaBlocks.POWDERBARREL, 8)) + .explosives(new ItemStack(MetaBlocks.POWDERBARREL, 8)) .buildAndRegister(); RecipeMaps.IMPLOSION_RECIPES.recipeBuilder() .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) .outputs(recipeBuilder.getOutputs()) .chancedOutputs(recipeBuilder.getChancedOutputs()) - .explosivesAmount(4) + .explosives(4) .buildAndRegister(); RecipeMaps.IMPLOSION_RECIPES.recipeBuilder() .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) .outputs(recipeBuilder.getOutputs()) .chancedOutputs(recipeBuilder.getChancedOutputs()) - .explosivesType(MetaItems.DYNAMITE.getStackForm(2)) + .explosives(MetaItems.DYNAMITE.getStackForm(2)) .buildAndRegister(); RecipeMaps.IMPLOSION_RECIPES.recipeBuilder() .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) .outputs(recipeBuilder.getOutputs()) .chancedOutputs(recipeBuilder.getChancedOutputs()) - .explosivesType(new ItemStack(MetaBlocks.ITNT)) + .explosives(new ItemStack(MetaBlocks.ITNT)) .buildAndRegister(); - }); + }) + .build(); /** * Any Recipe added to the Compressor not specifying an EUt value will default to 491,520. * Any Recipe added to the Compressor not specifying a duration value will default to 1. */ - @ZenProperty - public static final RecipeMap ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES = new RecipeMap<>( - "electric_implosion_compressor", 6, 2, 0, 0, - new SimpleRecipeBuilder().duration(1).EUt(VA[UV]).chancedOutput(dust, Materials.DarkAsh, 2500, 0), false) - .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2) - .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2) - .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2) - .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2) - .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2) - .setSlotOverlay(false, false, true, GuiTextures.IMPLOSION_OVERLAY_2) - .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) - .setSound(SoundEvents.ENTITY_GENERIC_EXPLODE) - .setSmallRecipeMap(RecipeMaps.IMPLOSION_RECIPES); + public static final RecipeMap ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES = new RecipeMapBuilder<>( + "electric_implosion_compressor", + new SimpleRecipeBuilder().duration(1).EUt(VA[UV]).chancedOutput(dust, Materials.DarkAsh, 2500, 0)) + .itemInputs(6) + .itemOutputs(2) + .fluidInputs(0) + .fluidOutputs(0) + .itemSlotOverlay(GuiTextures.IMPLOSION_OVERLAY_2, false, false) + .itemSlotOverlay(GuiTextures.IMPLOSION_OVERLAY_2, false, false) + .itemSlotOverlay(GuiTextures.IMPLOSION_OVERLAY_2, false, false) + .itemSlotOverlay(GuiTextures.IMPLOSION_OVERLAY_2, false, false) + .itemSlotOverlay(GuiTextures.IMPLOSION_OVERLAY_2, false, false) + .itemSlotOverlay(GuiTextures.IMPLOSION_OVERLAY_2, false, true) + .itemSlotOverlay(GuiTextures.DUST_OVERLAY, true, true) + .sound(SoundEvents.ENTITY_GENERIC_EXPLODE) + .build().setSmallRecipeMap(RecipeMaps.IMPLOSION_RECIPES); } diff --git a/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java b/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java index 99516db..23b41fc 100644 --- a/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java +++ b/src/main/java/com/github/gtexpert/inb/core/INBCoreModule.java @@ -1,5 +1,7 @@ package com.github.gtexpert.inb.core; +import static gregtech.api.util.GTUtility.gregtechId; + import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipe; @@ -52,14 +54,13 @@ public void construction(FMLConstructionEvent event) {} public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); - RecipeMaps.IMPLOSION_RECIPES.onRecipeBuild( - recipeBuilder -> { - INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder() - .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) - .outputs(recipeBuilder.getOutputs()) - .chancedOutputs(recipeBuilder.getChancedOutputs()) - .buildAndRegister(); - }); + RecipeMaps.IMPLOSION_RECIPES.onRecipeBuild(gregtechId("implosion_compressor"), recipeBuilder -> { + INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder() + .inputs(recipeBuilder.getInputs().toArray(new GTRecipeInput[0])) + .outputs(recipeBuilder.getOutputs()) + .chancedOutputs(recipeBuilder.getChancedOutputs()) + .buildAndRegister(); + }); } @Override diff --git a/src/main/resources/assets/inb/models/item/mte.json b/src/main/resources/assets/inb/models/item/mte.json new file mode 100644 index 0000000..b104c31 --- /dev/null +++ b/src/main/resources/assets/inb/models/item/mte.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "blocks/iron_block" + } + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 17c49ae..70a1d7d 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -12,6 +12,8 @@ ], "credits": "", "dependencies": [ + "chickenchunks", + "modularui", "mixinbooter", "gregtech", "gcym"