From 8b62c8a4b805aebc7fd327218b83483af5983b39 Mon Sep 17 00:00:00 2001 From: lothrazar Date: Fri, 22 Dec 2023 11:11:05 -0800 Subject: [PATCH 1/3] bump to latest mc1.16.5 dependences --- build.gradle | 5 ++++- gradle.properties | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index b6b092ea1..35a253b4f 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,10 @@ dependencies { compileOnly fg.deobf("vazkii.botania:Botania:${botania_version}:api") runtimeOnly fg.deobf("vazkii.botania:Botania:${botania_version}") - implementation fg.deobf("curse.maven:crafttweaker-239197:3433252") + + implementation fg.deobf("com.blamejared.crafttweaker:CraftTweaker-${mc_version}:${crafttweaker_version}") + + // runtimeOnly fg.deobf("curse.maven:just-enough-effect-descriptions-jeed-532286:3541185") runtimeOnly fg.deobf("curse.maven:liquid-blocks-301999:3323640") diff --git a/gradle.properties b/gradle.properties index fff02ce7a..5fe0eaff8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,19 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false curse_id=239286 -mod_version=1.5.21 +mod_version=1.5.22-SNAPSHOT mc_version=1.16.5 forge_version=36.2.34 mappings_version=20201028-1.16.3 # optional dependencies -jei_version=jei-1.16.5:7.7.1.138 -curios_version=1.16.5-4.0.5.3 -patchouli_version=1.16.4-53.2 botania_version=1.16.5-419 +crafttweaker_version=7.1.2.526 +curios_version=1.16.5-4.1.0.0 +jei_version=jei-1.16.5:7.8.0.1009 +patchouli_version=1.16.4-53.3 # folder to copy the build output jar dist_folder=c:/temp + From bfeb28ec320a5a605f7796e1a1ee24cf86717c5b Mon Sep 17 00:00:00 2001 From: lothrazar Date: Tue, 6 Feb 2024 08:46:57 -0800 Subject: [PATCH 2/3] cleanup gradle and update optional dependencies --- build.gradle | 5 ----- gradle.properties | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 35a253b4f..2525e98a5 100644 --- a/build.gradle +++ b/build.gradle @@ -222,11 +222,6 @@ task signJar(type: SignJar, dependsOn: jar) { outputFile = jar.archivePath } -task copyJar(type: Copy) { - from jar - into "${dist_folder}" -} - task cleanJar { delete 'build/libs' } diff --git a/gradle.properties b/gradle.properties index 5fe0eaff8..e5928ac55 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,12 +11,9 @@ forge_version=36.2.34 mappings_version=20201028-1.16.3 # optional dependencies -botania_version=1.16.5-419 +botania_version=1.16.5-420.3 crafttweaker_version=7.1.2.526 curios_version=1.16.5-4.1.0.0 jei_version=jei-1.16.5:7.8.0.1009 patchouli_version=1.16.4-53.3 -# folder to copy the build output jar -dist_folder=c:/temp - From 676db8f13b90a8bc08b912471b42c05452ffdcf3 Mon Sep 17 00:00:00 2001 From: lothrazar Date: Sun, 31 Mar 2024 20:15:53 -0700 Subject: [PATCH 3/3] 1.5.22 #2351 crafting stick fix --- gradle.properties | 2 +- .../item/crafting/CraftingBagContainer.java | 16 +--------------- update.json | 3 ++- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index e5928ac55..3360d1996 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false curse_id=239286 -mod_version=1.5.22-SNAPSHOT +mod_version=1.5.22 mc_version=1.16.5 forge_version=36.2.34 diff --git a/src/main/java/com/lothrazar/cyclic/item/crafting/CraftingBagContainer.java b/src/main/java/com/lothrazar/cyclic/item/crafting/CraftingBagContainer.java index 083a7af1d..a0c2894fe 100644 --- a/src/main/java/com/lothrazar/cyclic/item/crafting/CraftingBagContainer.java +++ b/src/main/java/com/lothrazar/cyclic/item/crafting/CraftingBagContainer.java @@ -1,6 +1,5 @@ package com.lothrazar.cyclic.item.crafting; -import com.lothrazar.cyclic.ModCyclic; import com.lothrazar.cyclic.base.ContainerBase; import com.lothrazar.cyclic.data.IContainerCraftingAction; import com.lothrazar.cyclic.registry.ContainerScreenRegistry; @@ -42,9 +41,8 @@ public CraftingBagContainer(int id, PlayerInventory playerInventory, PlayerEntit // if (slot > -1) { this.bag = playerInventory.getStackInSlot(slot); - ModCyclic.LOGGER.info("bag " + bag); } - if (bag.isEmpty()) { + if (bag == null || bag.isEmpty()) { this.bag = super.findBag(ItemRegistry.crafting_bag); } //grid @@ -59,11 +57,7 @@ public boolean isItemValid(ItemStack stack) { }); } } - // - // this.nbt = bag.getOrCreateTag(); bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).ifPresent(h -> { - // this.handler = h; - // this.slots = h.getSlots(); for (int j = 0; j < h.getSlots(); j++) { ItemStack inBag = h.getStackInSlot(j); if (!inBag.isEmpty()) { @@ -80,25 +74,17 @@ public void onContainerClosed(PlayerEntity playerIn) { this.craftResult.setInventorySlotContents(0, ItemStack.EMPTY); //this is not the saving version if (playerIn.world.isRemote == false) { - // if (this.handler == null) { IItemHandler handler = bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null); if (handler == null) { return; } - // } for (int i = 0; i < 9; i++) { ItemStack crafty = this.craftMatrix.getStackInSlot(i); - // if (crafty.isEmpty()) { - // continue; - // } handler.extractItem(i, 64, false); ItemStack failtest = handler.insertItem(i, crafty, false); if (!failtest.isEmpty()) { // } - // - // ItemStack doubleTest = h.extractItem(i, 64, true); - // ModCyclic.LOGGER.info(doubleTest + " got saved in " + i); } } // clearContainer(playerIn, playerIn.world, craftMatrix); diff --git a/update.json b/update.json index 00c0d726d..aaf9faa75 100644 --- a/update.json +++ b/update.json @@ -1,7 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/cyclic", "promos": { - "1.16.5-latest": "1.5.21" + "1.16.5-latest": "1.5.22" }, "1.16.5": { "0.6.1": "Ported ", @@ -78,5 +78,6 @@ ,"1.5.19":"Backports from mc1.18.2: right-click the Crafting Stick anywhere in your inventory screen, even while not holding it, to open it. Fix logs about 'unused frames'. Fixed logs about ' Unknown recipe category: cyclic:'. Fix Combustion Generator consumes Empty Bucket #2146. Fix #2171 Rich Soil acting translucent and blocksounds. #2138 /cyclic commands can run in functions and command blocks" ,"1.5.20":"#2102 wooden and golden hopper deposit logic fixed, now matches 1.18.2+ versions. #2085 Hopper reach area & pickup logic now uses vanilla-hopper area size. JEED compatibility added for some potion effects. Port Fishing Net and Mending Fishingrods compatibility from 1.12.2 #2067. Ender Apple now sends a message if nothing is found (void/flatworlds/etc). Growth enchant now skips IGrowable blocks that return false for 'canGrow();'. Many new config options added for: growth enchant, beheading enchant, battery, sprinkler, experience_pylon, fisher, scythes, and others in cyclic.toml" ,"1.5.21":"#1933 Sack of Holding chest placement override added, with new config to revert back to legacy behavior if desired (overrideChestSingle). #2168 fix bug where ender shelf sometimes would not save contents when mined after exiting reloading world when client data desyncs. Added a percentage config and ignorelist config for cyclic:disarm enchantment (disarmPercentPerLevel, disarmIngoredMobs), resolves it dropping your copied weapon from alexsmobs:mimicube #2249. Fix #1878 layered and/or logic for multiple wireless transmitters on the same node " + ,"1.5.22":"Fix #2351 advanced crafting stick not opening. " } }