move ProgrammerArt, work on #5484, #5492, #5483

Author: Partonetrain

changelog.txt

@@ -1,9 +1,15 @@
 # Quark 4.1-476 For Neoforge 1.21.1
 
-This is mostly an internal update addressing some niche issues (so far).
+More bugfixes! Yippee!
 
-## Internal changes
+## Fixes
+- Added a potential fix for #5492: Latest versions of Quark+Create (ClassCastException) issue Neoforge 1.21.1
+- Fixed #5483: Singleplayer performance issue with expensive worldgen and EnhancedLaddersModule
+- Fixed #5484: [1.21.1] Other mods' built in override recipe for stone tools doesn't work and only Quark's version load even if you set the mod to load after Quark
+
+## Changes
 - Quark VDO has been split into different datapacks for each relevant module. Each datapack now uses datapack filters to disable relevant vanilla recipes instead of overriding the entire file. This should fix problems with Quark always overriding certain data files no matter what.
+- The Quark Programmer Art is no longer deployed to the instance's resourcepacks folder if the option is enabled. Instead, it is directly added to the resource pack selection screen under "Available", similar to other mods' optional resource packs. You can safely delete Quark Programmer Art.zip from your resourcepacks folder if it was previously deployed.
 
 ## Additions
 

src/main/java/org/violetmoon/quark/base/Quark.java

@@ -16,6 +16,7 @@
 import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.ChestBlock;
+import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.FurnaceBlockEntity;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -123,6 +124,24 @@ private static void addPackFinders(AddPackFindersEvent event){
 				}
 			}
 		}
+
+		if(QuarkGeneralConfig.generateProgrammerArt){
+			if (event.getPackType() == PackType.CLIENT_RESOURCES) {
+				IModFile quarkJar = ModList.get().getModFileById(MOD_ID).getFile();
+				Path path = quarkJar.findResource("resourcepacks", "quark_programmer_art");
+
+				PackSelectionConfig packSelectionConfig = new PackSelectionConfig(false, Pack.Position.TOP, false);
+				PackLocationInfo packLocationInfo = new PackLocationInfo("quark_programmer_art", Component.literal("Quark Programmer Art"), PackSource.BUILT_IN,
+						Optional.empty()
+				);
+
+				PathPackResources.PathResourcesSupplier pathResourcesSupplier = new PathPackResources.PathResourcesSupplier(path);
+				Pack pack = Pack.readMetaAndCreate(packLocationInfo, pathResourcesSupplier, PackType.SERVER_DATA, packSelectionConfig);
+				event.addRepositorySource(packConsumer -> {
+					packConsumer.accept(pack);
+				});
+			}
+		}
 	}
 
 	private static void addSubDataPack(String subPackName, AddPackFindersEvent event){
@@ -173,7 +192,7 @@ public static void registerCapabilities(RegisterCapabilitiesEvent event) {
 
 		event.registerBlock(Capabilities.ItemHandler.BLOCK, (level, pos, state, blockEntity, side) -> new SidedInvWrapper((PipeBlockEntity)blockEntity, side), PipesModule.pipe, PipesModule.encasedPipe);
 		event.registerBlock(Capabilities.ItemHandler.BLOCK, (level, pos, state, blockEntity, side) -> new InvWrapper((CrateBlockEntity)blockEntity), CrateModule.crate);
-		event.registerBlock(Capabilities.ItemHandler.BLOCK, (level, pos, state, blockEntity, side) -> new SidedInvWrapper((FurnaceBlockEntity)blockEntity, side), VariantFurnacesModule.blackstoneFurnace, VariantFurnacesModule.deepslateFurnace);
+		event.registerBlock(Capabilities.ItemHandler.BLOCK, (level, pos, state, blockEntity, side) -> new SidedInvWrapper((AbstractFurnaceBlockEntity)blockEntity, side), VariantFurnacesModule.blackstoneFurnace, VariantFurnacesModule.deepslateFurnace);
 
 	}
 

src/main/java/org/violetmoon/quark/base/client/handler/QuarkProgrammerArtHandler.java

@@ -81,8 +81,8 @@ public class QuarkGeneralConfig {
 	@Config(description = "The amount of slots the chest button system should seek when trying to figure out if a container should be eligible for them.")
 	public static int chestButtonSlotTarget = 27;
 
-	@Config(description = "Set this to false to not generate the Quark Programmer Art resource pack")
-	public static boolean generateProgrammerArt = true; //TODO rework this, we don't need to deploy the file with AddPackFinderEvent
+	@Config(description = "Set this to false to not show the Quark Programmer Art resource pack in the resource pack selection screen")
+	public static boolean generateProgrammerArt = true;
 
 	@Config(description = "Set this to false to prevent Quark from ever disabling any vanilla data files. This will break certain modules, so only do this if you know what you're doing!")
 	public static boolean quarkVDO = true;

src/main/java/org/violetmoon/quark/base/config/QuarkGeneralConfig.java

@@ -18,7 +18,6 @@
 import org.violetmoon.quark.base.client.handler.ClientUtil;
 import org.violetmoon.quark.base.client.handler.InventoryButtonHandler;
 import org.violetmoon.quark.base.client.handler.ModelHandler;
-import org.violetmoon.quark.base.client.handler.QuarkProgrammerArtHandler;
 import org.violetmoon.quark.base.handler.ContributorRewardHandler;
 import org.violetmoon.quark.base.handler.WoodSetHandler;
 import org.violetmoon.quark.catnip.animation.AnimationTickHolder;
@@ -43,7 +42,6 @@ public void start() {
 				.subscribe(ModelHandler.class) //TODO: Make this especially not a singleton, move it into respective modules
 				.subscribe(ContributorRewardHandler.Client.class)
 				.subscribe(WoodSetHandler.Client.class)
-				.subscribe(QuarkProgrammerArtHandler.class)
 				.subscribe(ClientUtil.class);
 
 		Quark.ZETA.playBus

src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java

@@ -52,6 +52,7 @@
 import org.violetmoon.zeta.event.bus.PlayEvent;
 import org.violetmoon.zeta.event.load.ZAddReloadListener;
 import org.violetmoon.zeta.event.load.ZConfigChanged;
+import org.violetmoon.zeta.event.load.ZGatherHints;
 import org.violetmoon.zeta.event.load.ZRegister;
 import org.violetmoon.zeta.event.play.ZAnvilRepair;
 import org.violetmoon.zeta.event.play.ZAnvilUpdate;

src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java

@@ -193,7 +193,7 @@ public void onPlayerTick(ZPlayerTick.Start event) {
 				return;
 
 			Player player = event.getPlayer();
-			if(player.onClimbable() && player.level().isClientSide) {
+			if(player.level().isClientSide() && player.onClimbable()) {
 				BlockPos playerPos = player.blockPosition();
 				BlockPos downPos = playerPos.below();
 

src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java

@@ -150,24 +150,26 @@ private void registerAncientTomeAnvilRecipes(@NotNull IRecipeRegistration regist
             EnchantmentInstance data = new EnchantmentInstance(enchant, enchant.value().getMaxLevel());
             recipes.add(factory.createAnvilRecipe(EnchantedBookItem.createForEnchantment(data),
                     Collections.singletonList(AncientTomeItem.getEnchantedItemStack(enchant)),
-                    Collections.singletonList(EnchantedBookItem.createForEnchantment(new EnchantmentInstance(data.enchantment, data.level + 1)))));
+                    Collections.singletonList(EnchantedBookItem.createForEnchantment(new EnchantmentInstance(data.enchantment, data.level + 1))),
+                    Quark.asResource("ancient_tome_book_overleveling")
+            ));
         }
         registration.addRecipes(RecipeTypes.ANVIL, recipes);
     }
 
     private void registerPickarangAnvilRepairs(Item pickarang, Item repairMaterial, @NotNull IRecipeRegistration registration, @NotNull IVanillaRecipeFactory factory) {
         //Repair ratios taken from JEI anvil maker
         ItemStack nearlyBroken = new ItemStack(pickarang);
-        nearlyBroken.setDamageValue(nearlyBroken.getMaxDamage());
+        nearlyBroken.setDamageValue(nearlyBroken.getMaxDamage() - 1);
         ItemStack veryDamaged = nearlyBroken.copy();
         veryDamaged.setDamageValue(veryDamaged.getMaxDamage() * 3 / 4);
         ItemStack damaged = nearlyBroken.copy();
         damaged.setDamageValue(damaged.getMaxDamage() * 2 / 4);
 
         IJeiAnvilRecipe materialRepair = factory.createAnvilRecipe(nearlyBroken,
-                Collections.singletonList(new ItemStack(repairMaterial)), Collections.singletonList(veryDamaged));
+                Collections.singletonList(new ItemStack(repairMaterial)), Collections.singletonList(veryDamaged), Quark.asResource("nearly_broken_pickarang_repair"));
         IJeiAnvilRecipe toolRepair = factory.createAnvilRecipe(veryDamaged,
-                Collections.singletonList(veryDamaged), Collections.singletonList(damaged));
+                Collections.singletonList(veryDamaged), Collections.singletonList(damaged), Quark.asResource("very_damaged_pickarang_repair"));
 
         registration.addRecipes(RecipeTypes.ANVIL, Arrays.asList(materialRepair, toolRepair));
     }