merge trunk/1.16

build.gradle

@@ -84,38 +84,9 @@ dependencies {
     compileOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}:api")
     runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}")
 
-
-    // other optional integration
- //   runtimeOnly fg.deobf("curse.maven:liquid-blocks-301999:3671594") // recipes
- //   runtimeOnly fg.deobf("curse.maven:just-enough-effect-descriptions-jeed-532286:3820697") // lang file 
- //   runtimeOnly fg.deobf("curse.maven:plain-grinder-452000:3653027") // recipes and datatags
- //   runtimeOnly fg.deobf("curse.maven:farmers-delight-398521:3999153") // recipes and datatags
- //   runtimeOnly fg.deobf("curse.maven:roots-classic-295780:3939973") //
- //   runtimeOnly fg.deobf("curse.maven:expandability-465066:3678612")
- //   runtimeOnly fg.deobf("curse.maven:artifacts-312353:3984105") // everlasting beef compat
-
-	//added for testing
-  //  runtimeOnly fg.deobf("curse.maven:brutal-bosses-dungeon-557999:3916875")
-  //  runtimeOnly fg.deobf("curse.maven:mmmmmmmmmmmm-225738:3641681")
-  //  runtimeOnly fg.deobf("curse.maven:simple-storage-network-268495:3868680")
-  //  runtimeOnly fg.deobf("curse.maven:the-one-probe-245211:3671753")
-  //  runtimeOnly fg.deobf("curse.maven:construction-wand-399558:3712396")
-  //  runtimeOnly fg.deobf("curse.maven:gardening-tools-351990:3694027")
-  //  runtimeOnly fg.deobf("curse.maven:cucumber-272335:3859559")
-  //  runtimeOnly fg.deobf("curse.maven:mystical-agriculture-246640:4005473")
-  //  runtimeOnly fg.deobf("curse.maven:pickle-tweaks-238761:3793199")
-  //  runtimeOnly fg.deobf("curse.maven:libnonymous-357557:3677573")
-  //  runtimeOnly fg.deobf("curse.maven:bonsai-trees-278993:3677571")
-  //  runtimeOnly fg.deobf("curse.maven:pipez-443900:3694227") 
 
 //   implementation fg.deobf("curse.maven:absent-by-design-305840:3686851")
-//   implementation fg.deobf("curse.maven:selene-499980:3687411")
-//   implementation fg.deobf("curse.maven:supplementaries-412082:3687458")
-//   implementation fg.deobf("curse.maven:construction-wand-399558:3562331")
-//   implementation fg.deobf("curse.maven:ato-405593:3638255")
-//   implementation fg.deobf("curse.maven:botania-225643:3664223")
-//   implementation fg.deobf("curse.maven:autoreglib-250363:3642382")
-//   implementation fg.deobf("curse.maven:quark-243121:3687633")
+
 
 }
 
@@ -195,7 +166,6 @@ task signJar(type: SignJar, dependsOn: jar) {
 }
 
 
-
 task cleanJar {
   delete 'build/libs'
 }

src/main/java/com/lothrazar/cyclic/item/crafting/CraftingBagContainer.java

@@ -29,7 +29,7 @@ public class CraftingBagContainer extends ContainerBase implements IContainerCra
   private final ResultContainer craftResult = new ResultContainer();
   //
   public int slot = -1;
-  public ItemStack bag;
+  public ItemStack bag = ItemStack.EMPTY;
 
   public CraftingBagContainer(int id, Inventory playerInventory, Player player, int slot) {
     super(MenuTypeRegistry.CRAFTING_BAG.get(), id);
@@ -42,9 +42,8 @@ public CraftingBagContainer(int id, Inventory playerInventory, Player player, in
     this.addSlot(new ResultSlot(playerInventory.player, this.craftMatrix, this.craftResult, 0, 124, 35));
     if (slot > -1) {
       this.bag = playerInventory.getItem(slot);
-      ModCyclic.LOGGER.info("bag   " + bag);
     }
-    if (bag.isEmpty()) {
+    if (bag == null || bag.isEmpty()) {
       this.bag = super.findBag(ItemRegistry.CRAFTING_BAG.get());
     }
     //grid

update.json

@@ -4,8 +4,8 @@
 		"1.18-latest": "1.6.7",
 		"1.18.1-latest": "1.6.15",
 		"1.18.2-latest": "1.7.17",
-		"1.16.5-latest": "1.5.21"
- 
+		"1.16.5-latest": "1.5.22"
+
 	},
 	"1.16.5": {
 		"0.6.1": "Ported ",
@@ -73,6 +73,17 @@
 		,"1.5.10":"Machines that use fluid ingredients now accept fluid tags such as 'forge:experience' in place of fluid ID; updated some existing recipes on Solidifier and Evap Generator to match (old recipe JSONs still all compatible/valid).  Fixed battery energy item stack capability provider.  Refreshed texture of Air charm. Vision helmet compat with curios head slot.  Revert GPS card fixes to v1.5.6.  One recipe added to cyclic:generator_fluid for tag forge:biomass.  Default config value updated for disable_pickup on the Sack of Holding.  Add compat for Beheading enchant with the 7 Tinkers Construct mob heads (config heads are still checked last.  no changes if tinkers not installed).  "
 		,"1.5.11":"Fix a bugged interaction with Settings data card and Filter data card #1970 . Torch Charm now tries to avoid placing on non-solid blocks such as top side of a bottom Slab where the torch breaks right away. "
 		,"1.5.12":"PR #1976 by metalshark :Item, Energy, and Fluid Cables now have Increased performance (compile time optimisations, reduction in cyclomatic complexity and removal of redundant checks) "
+		,"1.5.13":"Added support for using the left hand on Item User. #1994 by 'metalshark' Fixes issue #1992.  "
+		,"1.5.14":"Fix #2016 regarding settings data card.  Fix Crash when trying to push Cyclic item cables with create piston.   Merge pull request #2013 from metalshark : Add caching of packager recipes and move static methods out of main class for scaling.   Merge pull request #2011 from metalshark : Invalidate capabilities when declaring them "
+		,"1.5.15":"Fluids cyclic:honey, xpjuice, and biomass are now swim-able. Fix harvesting Battery and Tank.  Fix scythe of foraging not harvesting some 2-tall flower bushes. Fix cannot shift-click from Packager. Added client text config 'FluidContents'. Reusable Ender Eye now works with YUNGS better strongholds (structure ID 'betterstrongholds:stronghold').  Fix Item Transfer Node missing loot table. Fix ender shelf event conflict with supplementaries:book_pile. Empty Ender Shelf now drops item stack with no datatag. Hoppers can now insert into Composter.  Fix wooden hopper sometimes not picking up items on top of it. Fluid Cable and Fluid Hopper can now extract water from a full Water Cauldron.  Cyan Flower can now go into Compost. Fix harvest scythe desync on servers.  Fix #2057 doorbell on leaf blocks. fix #2054 dodge concurrent exceptions when present so isabesnt is overkill. Fix #2056 remove event blocking bonemeal and podzol. Fix #2041 Inaccessible Enchantments, update enchant rarity levels to match mc1.18.2+ settings. Tunnel added to Shape Builder #1911.  Fix #2061 Block Reach enchant by using Attribute Modifiers (mod compatibility).   "
+		,"1.5.16":" Fix Workbench deletes items inside when mined #2121"
+		,"1.5.17":" Fix Workbench deletes items inside when mined #2121. Fix Fluid cable crashing game #2118 fluid pipe server crash #2090 using ConcurrentHashMap for smp issues (ConcurrentModificationException)."
+		,"1.5.18":"Added 'Always On / Requires Redstone' button to the Redstone Clock so it can be controlled (feature ported from mc 1.12.2 & 1.18.2)"
+		,"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.  "
+
 	},
 	"1.18.2": {
 		"1.6.0": "Ported Cyclic[1.16.5]-1.5.8 to Minecraft [1.17.1] & forge-37.0.85+.  Altered a few crafting recipes to use new items.  Removed Peat Generator (Use Peat items in Material Generator).  Removed 5 Mason blocks, replaced with Compressed Cobblestone, Flint Block.  Added Peace Candle, Translocation Platform, Stone Mattock, Crushing Macerator, and Lava Sponge.  Added Copper Tools and Amethyst Tools, Copper Lantern, Copper Chain, Copper Bars, Gold Chain, Gold Bars, Gold Lantern (Art by @shynieke).  Added Copper Nuggets and Netherite Nuggets.  Added Netherite Lanterns, chains, and bars.  Added 3 Pressure Plates: Copper Netherite and Obsidian. ",