diff --git a/dependencies.gradle b/dependencies.gradle index e6f5906..c9a66ab 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,13 +40,15 @@ dependencies { // Published dependencies api("codechicken:codechickenlib:3.2.3.358") // CCL 3.2.3.358 + api("com.cleanroommc:modularui:2.5.0-rc1") { transitive = false } // MUI 2.5.0-rc1 api("com.cleanroommc:groovyscript:1.1.2") { transitive = false } // GrS 1.1.2 api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700") // CrT 4.1.20.700 api("appeng:ae2-uel:v0.56.4") { transitive = false } // AE2 0.56.4(IAEWrench access error) 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: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 // Debug Thaumcraft if (project.debug_all.toBoolean() || project.debug_thaumcraft.toBoolean()) { 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/gtwp/GTWPMod.java b/src/main/java/com/github/gtexpert/gtwp/GTWPMod.java index 7cf4690..0418601 100644 --- a/src/main/java/com/github/gtexpert/gtwp/GTWPMod.java +++ b/src/main/java/com/github/gtexpert/gtwp/GTWPMod.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.gtwp.api.ModValues; import com.github.gtexpert.gtwp.api.util.ModLog; @@ -32,7 +34,8 @@ version = Tags.VERSION, updateJSON = "https://forge.curseupdate.com/1093753/gtwoodprocessing", acceptedMinecraftVersions = "[1.12.2,1.13)", - dependencies = GTInternalTags.DEP_VERSION_STRING + "after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + + dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MODULRAUI + ";" + + "after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + "after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.FORESTRY + ";" + "after:" + Mods.Names.EXTRA_TREES + ";" + "after:" + Mods.Names.ADVANCED_ROCKETRY + ";" + "after:" + Mods.Names.PROJECT_VIBRANT_JOURNEYS + ";" + "after:" + Mods.Names.PLANTS + ";" + @@ -158,6 +161,11 @@ public static ItemBlock createItemBlock(T block, Function SAWMILL_RECIPES = new RecipeMap<>( - "sawmill", 2, 2, 1, 0, new SimpleRecipeBuilder(), false) - .setSlotOverlay(false, false, GuiTextures.SAWBLADE_OVERLAY) - .setSlotOverlay(true, false, false, GuiTextures.CUTTER_OVERLAY) - .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_SLICE, ProgressWidget.MoveType.HORIZONTAL) - .setSound(GTSoundEvents.CHAINSAW_TOOL); + public static final RecipeMap SAWMILL_RECIPES = new RecipeMapBuilder<>( + "sawmill", new SimpleRecipeBuilder()) + .itemInputs(2) + .itemOutputs(2) + .fluidInputs(1) + .fluidOutputs(0) + .itemSlotOverlay(GuiTextures.SAWBLADE_OVERLAY, false, false) + .itemSlotOverlay(GuiTextures.CUTTER_OVERLAY, true, false) + .itemSlotOverlay(GuiTextures.DUST_OVERLAY, true, true) + .progressBar(GuiTextures.PROGRESS_BAR_SLICE, ProgressWidget.MoveType.HORIZONTAL) + .sound(GTSoundEvents.CHAINSAW_TOOL) + .build(); } diff --git a/src/main/resources/assets/gtwp/models/item/mte.json b/src/main/resources/assets/gtwp/models/item/mte.json new file mode 100644 index 0000000..86cb52c --- /dev/null +++ b/src/main/resources/assets/gtwp/models/item/mte.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "blocks/iron_block" + } + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 70fd119..72cb777 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -14,6 +14,7 @@ "credits": "", "dependencies": [ "chickenchunks", + "modularui", "gregtech" ] }]