diff --git a/build.gradle b/build.gradle index c4e867c..f975e6c 100644 --- a/build.gradle +++ b/build.gradle @@ -4,11 +4,27 @@ import groovy.json.JsonParserType import groovy.json.JsonOutput plugins { - id "dev.architectury.loom" + id "me.modmuss50.mod-publish-plugin" version "0.7.4" id 'maven-publish' } +def unobfuscated = project.name.startsWith("26") +System.out.println("unobfuscated minecraft? " + unobfuscated) +apply plugin: unobfuscated + ? 'net.fabricmc.fabric-loom' + : 'net.fabricmc.fabric-loom-remap' +System.out.println(net.fabricmc.loom.LoomGradlePlugin.LOOM_VERSION) + +if (unobfuscated) { + configurations { + implementation.extendsFrom(modImplementation) + api.extendsFrom(modApi) + compileOnly.extendsFrom(modCompileOnly) + runtimeOnly.extendsFrom(modRuntimeOnly) + } +} + base.archivesName = project.archives_base_name version = stonecutter.current.version + "-" + mod_version group = rootProject.maven_group @@ -23,18 +39,22 @@ repositories { } } + + + configurations.configureEach { resolutionStrategy { force("net.fabricmc:fabric-loader:${fabric_loader_version}") } } + dependencies { minecraft "com.mojang:minecraft:${stonecutter.current.version}" - mappings loom.officialMojangMappings() + if (!unobfuscated) mappings loom.officialMojangMappings() if (loader == "fabric") { modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modApi "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}" - modImplementation("com.terraformersmc:modmenu:${modmenu_version}") + modCompileOnly("com.terraformersmc:modmenu:${modmenu_version}") modCompileOnly("me.lucko:fabric-permissions-api:${fpapi_version}") include modApi("teamreborn:energy:${team_reborn_energy_version}") { @@ -84,7 +104,7 @@ stonecutter { } } -def aw = "${mod_id}-${stonecutter.eval(stonecutter.current.version, ">=1.21.2") ? 1212 : 120}.accesswidener" +def aw = "${mod_id}-${stonecutter.eval(stonecutter.current.version, ">=26.0") ? 261 : stonecutter.eval(stonecutter.current.version, ">=1.21.2") ? 1212 : 120}.accesswidener" loom { accessWidenerPath.set(getRootProject().file("src/main/resources/${aw}")) @@ -94,22 +114,32 @@ loom { mixinConfigs("${mod_id}.mixins.json") } mixin { - useLegacyMixinAp = true + useLegacyMixinAp = !unobfuscated defaultRefmapName = "${mod_id}.refmap.json" } } def isJava21 = stonecutter.eval(stonecutter.current.version, ">=1.20.5") +def isJava25 = stonecutter.eval(stonecutter.current.version, ">=26.0") // todo figure out >=26.1 snap 1 tasks.withType(JavaCompile) { options.encoding = "UTF-8" - options.release = isJava21 ? 21 : 17 + options.release = isJava25 ? 25 : isJava21 ? 21 : 17 } def buildJar = tasks.create("buildJar", Copy.class) { into("${rootProject.layout.getBuildDirectory().get()}/libs/$mod_version") } +tasks.register('renameJarForPublication', Zip) { + dependsOn unobfuscated? jar : remapJar + from (unobfuscated? jar : remapJar).archiveFile.map { zipTree(it) } + archiveExtension = "jar" + metadataCharset "UTF-8" + destinationDirectory = base.libsDirectory + archiveClassifier = loader +} + afterEvaluate { buildJar.dependsOn(renameJarForPublication) buildJar.from(renameJarForPublication.archiveFile) @@ -118,11 +148,13 @@ afterEvaluate { java { withSourcesJar() - sourceCompatibility = isJava21 ? JavaVersion.VERSION_21 : JavaVersion.VERSION_17 - targetCompatibility = isJava21 ? JavaVersion.VERSION_21 : JavaVersion.VERSION_17 + sourceCompatibility = isJava25 ? JavaVersion.VERSION_25 : isJava21 ? JavaVersion.VERSION_21 : JavaVersion.VERSION_17 + targetCompatibility = isJava25 ? JavaVersion.VERSION_25 : isJava21 ? JavaVersion.VERSION_21 : JavaVersion.VERSION_17 } -remapJar { - if (loader == "neoforge") atAccessWideners.add aw +if (!unobfuscated) { + remapJar { + if (loader == "neoforge") atAccessWideners.add aw + } } ext { releaseChangelog = { @@ -208,14 +240,7 @@ processResources { } } -tasks.register('renameJarForPublication', Zip) { - dependsOn remapJar - from remapJar.archiveFile.map { zipTree(it) } - archiveExtension = "jar" - metadataCharset "UTF-8" - destinationDirectory = base.libsDirectory - archiveClassifier = loader -} + assemble.dependsOn renameJarForPublication @@ -292,7 +317,8 @@ publishMods { curseforge { minecraftVersions.addAll versions - if (isJava21) javaVersions.add(JavaVersion.VERSION_21) + if (isJava25) javaVersions.add(JavaVersion.VERSION_25) + else if (isJava21) javaVersions.add(JavaVersion.VERSION_21) else javaVersions.addAll(JavaVersion.VERSION_17,JavaVersion.VERSION_18) clientRequired = true serverRequired = true diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..e69de29 diff --git a/buildSrc/src/loomply.conventions.gradle.kts b/buildSrc/src/loomply.conventions.gradle.kts new file mode 100644 index 0000000..e69de29 diff --git a/settings.gradle.kts b/settings.gradle.kts index 19f5ea4..a746808 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,30 +15,31 @@ plugins { stonecutter { create(rootProject) { - version("1.20.1-fabric", "1.20.1") - version("1.20.1-forge", "1.20.1") +// version("1.20.1-fabric", "1.20.1") +// version("1.20.1-forge", "1.20.1") version("1.20.4-fabric", "1.20.4") - version("1.20.4-forge", "1.20.4") - version("1.20.4-neoforge", "1.20.4") - version("1.21.1-fabric", "1.21.1") - version("1.21.1-forge", "1.21.1") - version("1.21.1-neoforge", "1.21.1") - version("1.21.3-fabric", "1.21.3") - version("1.21.3-forge", "1.21.3") - version("1.21.3-neoforge", "1.21.3") - version("1.21.4-fabric", "1.21.4") - version("1.21.4-forge", "1.21.4") - version("1.21.4-neoforge", "1.21.4") - version("1.21.5-fabric", "1.21.5") - version("1.21.5-forge", "1.21.5") - version("1.21.5-neoforge", "1.21.5") - version("1.21.8-fabric", "1.21.8") - version("1.21.8-forge", "1.21.8") - version("1.21.8-neoforge", "1.21.8") - version("1.21.10-fabric", "1.21.10") - version("1.21.10-forge", "1.21.10") - version("1.21.10-neoforge", "1.21.10") +// version("1.20.4-forge", "1.20.4") +// version("1.20.4-neoforge", "1.20.4") +// version("1.21.1-fabric", "1.21.1") +// version("1.21.1-forge", "1.21.1") +// version("1.21.1-neoforge", "1.21.1") +// version("1.21.3-fabric", "1.21.3") +// version("1.21.3-forge", "1.21.3") +// version("1.21.3-neoforge", "1.21.3") +// version("1.21.4-fabric", "1.21.4") +// version("1.21.4-forge", "1.21.4") +// version("1.21.4-neoforge", "1.21.4") +// version("1.21.5-fabric", "1.21.5") +// version("1.21.5-forge", "1.21.5") +// version("1.21.5-neoforge", "1.21.5") +// version("1.21.8-fabric", "1.21.8") +// version("1.21.8-forge", "1.21.8") +// version("1.21.8-neoforge", "1.21.8") +// version("1.21.10-fabric", "1.21.10") +// version("1.21.10-forge", "1.21.10") +// version("1.21.10-neoforge", "1.21.10") version("1.21.11-fabric", "1.21.11") + version("26.1-fabric", "26.1-snapshot-1") vcsVersion = "1.20.4-fabric" } } diff --git a/src/main/java/wily/factoryapi/FactoryAPI.java b/src/main/java/wily/factoryapi/FactoryAPI.java index e8d2c1d..75bfe17 100644 --- a/src/main/java/wily/factoryapi/FactoryAPI.java +++ b/src/main/java/wily/factoryapi/FactoryAPI.java @@ -3,10 +3,11 @@ import net.minecraft.core.Direction; import net.minecraft.core.RegistryAccess; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.entity.BlockEntity; +import org.spongepowered.asm.mixin.MixinEnvironment; import wily.factoryapi.base.config.FactoryCommonOptions; import wily.factoryapi.base.config.FactoryConfig; //? if fabric { @@ -137,7 +138,8 @@ public FactoryAPI(){ } public static void init() { - LOGGER.info("Initializing FactoryAPI!"); + LOGGER.info("Initializing FactoryAPI and running mixin audit!"); + MixinEnvironment.getCurrentEnvironment().audit(); FactoryConfig.registerCommonStorage(createModLocation("common"), FactoryCommonOptions.COMMON_STORAGE); FactoryEvent.registerPayload(r->{ r.register( false, FactoryAPICommand.UIDefinitionPayload.ID); @@ -147,8 +149,8 @@ public static void init() { r.register( true, CommonConfigSyncPayload.ID_C2S); r.register(false, OpenExtraMenuPayload.ID); //? if >=1.21.2 { - /*r.register(false, CommonRecipeManager.ClientPayload.ID); - *///?} + r.register(false, CommonRecipeManager.ClientPayload.ID); + //?} }); FactoryEvent.preServerTick(s-> SECURE_EXECUTOR.executeAll()); FactoryEvent.registerCommands(((commandSourceStackCommandDispatcher, commandBuildContext, commandSelection) -> FactoryAPICommand.register(commandSourceStackCommandDispatcher,commandBuildContext))); @@ -160,20 +162,20 @@ public static void init() { }); FactoryEvent.PlayerEvent.JOIN_EVENT.register(HelloPayload::sendInitialPayloads); //? if >=1.21.2 { - /*Consumer updateRecipes = server -> CommonRecipeManager.updateRecipes(server.getRecipeManager()); + Consumer updateRecipes = server -> CommonRecipeManager.updateRecipes(server.getRecipeManager()); FactoryEvent.PlayerEvent.RELOAD_RESOURCES_EVENT.register(playerList-> { updateRecipes.accept(playerList.getServer()); CommonNetwork.sendToPlayers(playerList.getPlayers(), CommonRecipeManager.ClientPayload.getInstance()); }); FactoryEvent.serverStarted(updateRecipes); - *///?} + //?} FactoryEvent.PlayerEvent.REMOVED_EVENT.register(sp->CommonNetwork.ENABLED_PLAYERS.removeAll(sp.getUUID())); FactoryEvent.serverStopped(s-> { SECURE_EXECUTOR.clear(); CommonNetwork.ENABLED_PLAYERS.clear(); //? if >=1.21.2 { - /*CommonRecipeManager.clearRecipes(); - *///?} + CommonRecipeManager.clearRecipes(); + //?} currentServer = null; }); //? if fabric { @@ -181,23 +183,23 @@ public static void init() { //?} } - public static ResourceLocation createLocation(String namespace, String path){ - return ResourceLocation.tryBuild(namespace,path); + public static Identifier createLocation(String namespace, String path){ + return Identifier.tryBuild(namespace,path); } - public static ResourceLocation createLocation(String location){ - return ResourceLocation.tryParse(location); + public static Identifier createLocation(String location){ + return Identifier.tryParse(location); } - public static ResourceLocation createModLocation(String path){ + public static Identifier createModLocation(String path){ return createLocation(MOD_ID,path); } - public static ResourceLocation createVanillaLocation(String path){ + public static Identifier createVanillaLocation(String path){ //? if <1.20.5 { - return new ResourceLocation(path); - //?} else - //return ResourceLocation.withDefaultNamespace(path); + /*return new Identifier(path); + *///?} else + return Identifier.withDefaultNamespace(path); } public static Loader getLoader() { diff --git a/src/main/java/wily/factoryapi/FactoryAPIClient.java b/src/main/java/wily/factoryapi/FactoryAPIClient.java index c881e0f..8e55d81 100644 --- a/src/main/java/wily/factoryapi/FactoryAPIClient.java +++ b/src/main/java/wily/factoryapi/FactoryAPIClient.java @@ -1,47 +1,42 @@ package wily.factoryapi; //? if >=1.21 { -/*import com.mojang.serialization.MapCodec; +import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper; import net.minecraft.client.DeltaTracker; -*///?} -import com.mojang.serialization.JsonOps; +//?} import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.client.color.block.BlockColor; //? if >1.21.4 { -/*import net.minecraft.client.renderer.block.model.BlockStateModel; -*///?} else { -import net.minecraft.client.renderer.block.BlockModelShaper; +import net.minecraft.client.renderer.block.model.BlockStateModel; +//?} else { +/*import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; -//?} +import net.minecraft.client.resources.model.ModelIdentifier; +*///?} //? if <1.21.4 { -import net.minecraft.client.color.item.ItemColor; -//?} -//? if >=1.21.2 { -/*import net.minecraft.util.profiling.Profiler; +/*import net.minecraft.client.color.item.ItemColor; *///?} +//? if >=1.21.2 { +import net.minecraft.util.profiling.Profiler; +//?} //? if >=1.21.6 { -/*import net.minecraft.client.renderer.chunk.ChunkSectionLayer; -*///?} +import net.minecraft.client.renderer.chunk.ChunkSectionLayer; +//?} import net.minecraft.util.profiling.ProfilerFiller; -import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.MenuAccess; import net.minecraft.client.model.EntityModel; -import net.minecraft.client.model.HumanoidModel; -import net.minecraft.client.model.Model; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.builders.LayerDefinition; import net.minecraft.client.player.LocalPlayer; -import net.minecraft.client.renderer.ItemBlockRenderTypes; //? if <1.21.11 { -import net.minecraft.client.renderer.RenderType; -//?} else { -/*import net.minecraft.client.renderer.rendertype.RenderTypes; -*///?} +/*import net.minecraft.client.renderer.RenderType; +*///?} else { +import net.minecraft.client.renderer.rendertype.RenderTypes; +//?} import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.LivingEntityRenderer; @@ -51,62 +46,50 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.PackType; -import net.minecraft.server.packs.resources.PreparableReloadListener; -import net.minecraft.server.packs.resources.ReloadableResourceManager; -import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.RecipeManager; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BooleanProperty; import wily.factoryapi.base.FactoryExtraMenuSupplier; import wily.factoryapi.base.client.screen.FactoryConfigScreen; import wily.factoryapi.base.network.*; import wily.factoryapi.mixin.base.MenuScreensAccessor; import wily.factoryapi.mixin.base.MenuTypeAccessor; //? if >=1.21.2 { -/*//? if <1.21.4 { -import net.minecraft.world.item.equipment.EquipmentModel; - //?} else { -/^import net.minecraft.client.resources.model.EquipmentClientInfo; +//? if <1.21.4 { +/*import net.minecraft.world.item.equipment.EquipmentModel; + *///?} else { import wily.factoryapi.mixin.base.SpecialModelRenderersAccessor; -^///?} +//?} import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; import net.minecraft.client.gui.components.toasts.ToastManager; -*///?} else { -import net.minecraft.client.gui.components.toasts.ToastComponent; -//?} +//?} else { +/*import net.minecraft.client.gui.components.toasts.ToastComponent; +*///?} import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.material.Fluid; //? if fabric { import wily.factoryapi.base.compat.client.FactoryAPIModMenuCompat; //? if <1.21.6 { -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; -//?} else { -/*import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap; -*///?} +/*import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +*///?} else { +import net.fabricmc.fabric.api.client.rendering.v1.ChunkSectionLayerMap; +//?} import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; -import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; -import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin; import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.client.rendering.v1.*; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; //?} else if forge { /*import net.minecraftforge.client.event.*; import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; @@ -134,14 +117,12 @@ import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; import net.neoforged.neoforge.common.NeoForge; *///?} -import org.jetbrains.annotations.Nullable; //? if <=1.20.1 { /*import wily.factoryapi.base.client.GuiSpriteManager; *///?} import wily.factoryapi.base.IFactoryItem; import wily.factoryapi.base.client.*; import wily.factoryapi.base.config.FactoryConfig; -import wily.factoryapi.base.client.UIDefinition; import wily.factoryapi.util.*; import java.util.*; @@ -152,8 +133,8 @@ public class FactoryAPIClient { - public static final ResourceLocation BLOCK_ATLAS = FactoryAPI.createVanillaLocation("textures/atlas/blocks.png"); - public static final ResourceLocation BLOCK_ATLAS_ID = FactoryAPI.createVanillaLocation("blocks"); + public static final Identifier BLOCK_ATLAS = FactoryAPI.createVanillaLocation("textures/atlas/blocks.png"); + public static final Identifier BLOCK_ATLAS_ID = FactoryAPI.createVanillaLocation("blocks"); public static final SecureExecutor SECURE_EXECUTOR = new SecureExecutor() { @Override public boolean isSecure() { @@ -164,7 +145,7 @@ public boolean isSecure() { public static UIDefinitionManager uiDefinitionManager; - public static final Map extraModels = new HashMap<>(); + public static final Map extraModels = new HashMap<>(); private static final Set playerMods = new HashSet<>(); @@ -178,19 +159,19 @@ public interface PlayerEvent extends Consumer{ } //? if >=1.21 { - /*public static DeltaTracker getDeltaTracker() { - return Minecraft.getInstance()./^? if <1.21.2 {^/getTimer/^?} else {^//^getDeltaTracker^//^?}^/(); + public static DeltaTracker getDeltaTracker() { + return Minecraft.getInstance()./*? if <1.21.2 {*//*getTimer*//*?} else {*/getDeltaTracker/*?}*/(); } - *///?} + //?} //? if <1.21.5 { - public static BakedModel getExtraModel(ResourceLocation resourceLocation) { + /*public static BakedModel getExtraModel(Identifier resourceLocation) { return Minecraft.getInstance().getModelManager().getModel(extraModels.get(resourceLocation).modelId()); } - //?} else { - /*public static BlockStateModel getExtraModel(ResourceLocation resourceLocation) { + *///?} else { + public static BlockStateModel getExtraModel(Identifier resourceLocation) { return Minecraft.getInstance().getBlockRenderer().getBlockModel(extraModels.get(resourceLocation).blockState()); } - *///?} + //?} public static boolean hasAPIOnServer() { return hasModOnServer(FactoryAPI.MOD_ID); @@ -209,33 +190,33 @@ public static RegistryAccess getRegistryAccess() { } public static ProfilerFiller getProfiler() { - return /*? if <1.21.2 {*/Minecraft.getInstance().getProfiler/*?} else {*//*Profiler.get*//*?}*/(); + return /*? if <1.21.2 {*//*Minecraft.getInstance().getProfiler*//*?} else {*/Profiler.get/*?}*/(); } - public static /*? if <1.21.2 {*/ToastComponent/*?} else {*//*ToastManager*//*?}*/getToasts() { - return Minecraft.getInstance()./*? if <1.21.2 {*/getToasts/*?} else {*//*getToastManager*//*?}*/(); + public static /*? if <1.21.2 {*//*ToastComponent*//*?} else {*/ToastManager/*?}*/getToasts() { + return Minecraft.getInstance()./*? if <1.21.2 {*//*getToasts*//*?} else {*/getToastManager/*?}*/(); } public static float getPartialTick() { - return /*? if <1.20.5 {*/Minecraft.getInstance().getDeltaFrameTime()/*?} else {*//*FactoryAPIClient.getDeltaTracker().getRealtimeDeltaTicks()*//*?}*/; + return /*? if <1.20.5 {*//*Minecraft.getInstance().getDeltaFrameTime()*//*?} else {*/FactoryAPIClient.getDeltaTracker().getRealtimeDeltaTicks()/*?}*/; } public static float getGamePartialTick(boolean allowFrozen) { - return /*? if <1.20.5 {*/(Minecraft.getInstance().isPaused() ? MinecraftAccessor.getInstance().getPausePartialTick() : /*? if >=1.20.3 {*/Minecraft.getInstance().level != null && Minecraft.getInstance().level.tickRateManager().runsNormally() || !allowFrozen ? Minecraft.getInstance().getFrameTime() : 1.0f/*?} else {*//*Minecraft.getInstance().getFrameTime()*//*?}*/)/*?} else {*/ /*FactoryAPIClient.getDeltaTracker().getGameTimeDeltaPartialTick(!allowFrozen)*//*?}*/; + return /*? if <1.20.5 {*//*(Minecraft.getInstance().isPaused() ? MinecraftAccessor.getInstance().getPausePartialTick() : /^? if >=1.20.3 {^/Minecraft.getInstance().level != null && Minecraft.getInstance().level.tickRateManager().runsNormally() || !allowFrozen ? Minecraft.getInstance().getFrameTime() : 1.0f/^?} else {^//^Minecraft.getInstance().getFrameTime()^//^?}^/)*//*?} else {*/ FactoryAPIClient.getDeltaTracker().getGameTimeDeltaPartialTick(!allowFrozen)/*?}*/; } //? if <1.21.2 { - public static RecipeManager getRecipeManager() { + /*public static RecipeManager getRecipeManager() { return Minecraft.getInstance().level.getRecipeManager(); } - //?} + *///?} public static Level getLevel() { return Minecraft.getInstance().level; } public static long getWindow() { - return Minecraft.getInstance().getWindow()./*? if >=1.21.9 {*//*handle()*//*?} else {*/getWindow()/*?}*/; + return Minecraft.getInstance().getWindow()./*? if >=1.21.9 {*/handle()/*?} else {*//*getWindow()*//*?}*/; } public static void init() { @@ -260,15 +241,15 @@ public static void init() { }); playerMods.clear(); //? if >=1.21.2 { - /*CommonRecipeManager.clearRecipes(); - *///?} + CommonRecipeManager.clearRecipes(); + //?} }); //? if fabric { //? if >=1.21.9 { - /*IFactoryItemClientExtension.map.forEach((i,c)-> ArmorRenderer.register((matrices, vertexConsumers, stack, entity, slot, light, contextModel)-> vertexConsumers.submitModel(c.getHumanoidArmorModel(entity,stack,slot,contextModel), entity, matrices, /^?if <1.21.11 {^/RenderType/^?} else {^//^RenderTypes^//^?}^/.entityCutout(((IFactoryItem) i).getArmorLocation(stack, slot)), light, OverlayTexture.NO_OVERLAY, 0xFFFFFF, null), i)); - *///?} else { - IFactoryItemClientExtension.map.forEach((i,c)-> ArmorRenderer.register((matrices, vertexConsumers, stack, entity, slot, light, contextModel)-> c.getHumanoidArmorModel(entity,stack,slot,contextModel).renderToBuffer(matrices,vertexConsumers.getBuffer(RenderType.entityCutout(((IFactoryItem) i).getArmorLocation(stack,/*? if <1.21.2 {*/ entity, /*?}*/slot))), light, OverlayTexture.NO_OVERLAY/*? if <=1.20.6 {*/, 1.0F,1.0F,1.0F, 1.0F/*?}*/),i)); - //?} + IFactoryItemClientExtension.map.forEach((i,c)-> ArmorRenderer.register((matrices, vertexConsumers, stack, entity, slot, light, contextModel)-> vertexConsumers.submitModel(c.getHumanoidArmorModel(entity,stack,slot,contextModel), entity, matrices, /*?if <1.21.11 {*//*RenderType*//*?} else {*/RenderTypes/*?}*/.entityCutout(((IFactoryItem) i).getArmorLocation(stack, slot)), light, OverlayTexture.NO_OVERLAY, 0xFFFFFF, null), i)); + //?} else { + /*IFactoryItemClientExtension.map.forEach((i,c)-> ArmorRenderer.register((matrices, vertexConsumers, stack, entity, slot, light, contextModel)-> c.getHumanoidArmorModel(entity,stack,slot,contextModel).renderToBuffer(matrices,vertexConsumers.getBuffer(RenderType.entityCutout(((IFactoryItem) i).getArmorLocation(stack,/^? if <1.21.2 {^/ /^entity, ^//^?}^/slot))), light, OverlayTexture.NO_OVERLAY/^? if <=1.20.6 {^//^, 1.0F,1.0F,1.0F, 1.0F^//^?}^/),i)); + *///?} if (FactoryAPI.isModLoaded("modmenu")) FactoryAPIModMenuCompat.init(); //?} else if neoforge && >=1.20.5 { /*FactoryAPIPlatform.getModEventBus().addListener(RegisterClientExtensionsEvent.class,r->IFactoryItemClientExtension.map.forEach((i,c)->r.registerItem(new IClientItemExtensions() { @@ -285,12 +266,12 @@ public HumanoidModel getHumanoidArmorModel(LivingEntity livingEntity, ItemSta }, i))); *///?} //? if >=1.21.4 { - /*IFactoryItemClientExtension.map.forEach(((item, iFactoryItemClientExtension) -> { + IFactoryItemClientExtension.map.forEach(((item, iFactoryItemClientExtension) -> { IFactoryBlockEntityWLRenderer renderer = iFactoryItemClientExtension.getCustomRenderer(); if (renderer == null) return; SpecialModelRenderersAccessor.getIdMapper().put(BuiltInRegistries.ITEM.getKey(item), renderer.createUnbakedCodec()); })); - *///?} + //?} } public static final FactoryEvent> STOPPING = new FactoryEvent<>(e-> m-> e.invokeAll(l->l.accept(m))); @@ -299,10 +280,10 @@ public HumanoidModel getHumanoidArmorModel(LivingEntity livingEntity, ItemSta //? if fabric { public static void registerPayload(CommonNetwork.Identifier id) { //? <1.20.5 { - ClientPlayNetworking.registerGlobalReceiver(id.location(), (m, l, b, s) -> id.decode(b).applyClient()); - //?} else { - /*ClientPlayNetworking.registerGlobalReceiver(id.type(), (payload, context) -> payload.applyClient()); - *///?} + /*ClientPlayNetworking.registerGlobalReceiver(id.location(), (m, l, b, s) -> id.decode(b).applyClient()); + *///?} else { + ClientPlayNetworking.registerGlobalReceiver(id.type(), (payload, context) -> payload.applyClient()); + //?} } //?} else if forge || neoforge { /*public static void registerReloadListener(PreparableReloadListener reloadListener) { @@ -407,7 +388,7 @@ public static int getFluidColor(FluidInstance fluid) { public static void registerKeyMapping(Consumer> registry) { //? if fabric { - registry.accept(KeyBindingHelper::registerKeyBinding); + registry.accept(KeyMappingHelper::registerKeyMapping); //?} elif (forge && <1.21.6) || neoforge { /*FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL,false, RegisterKeyMappingsEvent.class, e->registry.accept(e::register)); *///?} elif forge && <1.21.9 { @@ -478,19 +459,19 @@ public static void registerBlockColor(Consumer> re } //? if <1.21.4 { - public static void registerItemColor(Consumer> registry) { + /*public static void registerItemColor(Consumer> registry) { //? if fabric { registry.accept(ColorProviderRegistry.ITEM::register); //?} elif forge || neoforge { - /*FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL,false, RegisterColorHandlersEvent.Item.class, e->registry.accept(e::register)); - *///?} else - /*throw new AssertionError();*/ + /^FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL,false, RegisterColorHandlersEvent.Item.class, e->registry.accept(e::register)); + ^///?} else + /^throw new AssertionError();^/ } - //?} + *///?} - public static void registerRenderType(/*? if <1.21.6 {*/RenderType/*?} else {*//*ChunkSectionLayer*//*?}*/ renderType, Block... blocks) { + public static void registerRenderType(/*? if <1.21.6 {*//*RenderType*//*?} else {*/ChunkSectionLayer/*?}*/ renderType, Block... blocks) { //? if fabric { - BlockRenderLayerMap/*? if <1.21.6 {*/.INSTANCE/*?}*/.putBlocks(renderType,blocks); + ChunkSectionLayerMap/*? if <1.21.6 {*//*.INSTANCE*//*?}*/.putBlocks(renderType,blocks); //?} elif forge || neoforge { /*for (Block block : blocks) { ItemBlockRenderTypes.setRenderLayer(block,renderType); @@ -499,9 +480,9 @@ public static void registerRenderType(/*? if <1.21.6 {*/RenderType/*?} else {*// /*throw new AssertionError();*/ } - public static void registerRenderType(/*? if <1.21.6 {*/RenderType/*?} else {*//*ChunkSectionLayer*//*?}*/ renderType, Fluid... fluids) { + public static void registerRenderType(/*? if <1.21.6 {*//*RenderType*//*?} else {*/ChunkSectionLayer/*?}*/ renderType, Fluid... fluids) { //? if fabric { - BlockRenderLayerMap/*? if <1.21.6 {*/.INSTANCE/*?}*/.putFluids(renderType,fluids); + ChunkSectionLayerMap/*? if <1.21.6 {*//*.INSTANCE*//*?}*/.putFluids(renderType,fluids); //?} elif forge || neoforge { /*for (Fluid fluid : fluids) { ItemBlockRenderTypes.setRenderLayer(fluid,renderType); @@ -510,14 +491,14 @@ public static void registerRenderType(/*? if <1.21.6 {*/RenderType/*?} else {*// /*throw new AssertionError();*/ } - public record ExtraModelId(StateDefinition stateDefinition, BlockState blockState, ResourceLocation id/*? if <1.21.5 {*/, ModelResourceLocation modelId/*?}*/) { - public static ExtraModelId create(ResourceLocation id) { + public record ExtraModelId(StateDefinition stateDefinition, BlockState blockState, Identifier id/*? if <1.21.5 {*//*, ModelIdentifier modelId*//*?}*/) { + public static ExtraModelId create(Identifier id) { StateDefinition stateDefinition = new StateDefinition.Builder(Blocks.AIR).create(Block::defaultBlockState, BlockState::new); - return new ExtraModelId(stateDefinition, stateDefinition.any(), id/*? if <1.21.5 {*/, BlockModelShaper.stateToModelLocation(id, stateDefinition.any())/*?}*/); + return new ExtraModelId(stateDefinition, stateDefinition.any(), id/*? if <1.21.5 {*//*, BlockModelShaper.stateToModelLocation(id, stateDefinition.any())*//*?}*/); } } - public static void registerExtraModels(Consumer> registry) { + public static void registerExtraModels(Consumer> registry) { registry.accept(id-> extraModels.put(id, ExtraModelId.create(id))); } @@ -536,7 +517,7 @@ public static void registerEntityRenderer(Supplier definition) { //? if fabric { - EntityModelLayerRegistry.registerModelLayer(location,definition::get); + ModelLayerRegistry.registerModelLayer(location,definition::get); //?} else if (forge && <1.21.6) || neoforge { /*FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL,false, EntityRenderersEvent.RegisterLayerDefinitions.class, e-> e.registerLayerDefinition(location,definition)); *///?} else if forge { @@ -548,16 +529,16 @@ public static void registerLayerDefinition(ModelLayerLocation location, Supplier } public interface FactoryRenderLayerRegistry { - EntityRenderer=1.21.2 {*//*, ? *//*?}*/> getEntityRenderer(EntityType entityType); + EntityRenderer=1.21.2 {*/, ? /*?}*/> getEntityRenderer(EntityType entityType); EntityModelSet getEntityModelSet(); - =1.21.2 {*/ /*LivingEntityRenderState, S extends *//*?}*/LivingEntity,M extends EntityModel> void register(LivingEntityRenderer=1.21.2 {*/ /*S, *//*?}*/T, M> renderer, RenderLayer renderLayer); + =1.21.2 {*/ LivingEntityRenderState, S extends /*?}*/LivingEntity,M extends EntityModel> void register(LivingEntityRenderer=1.21.2 {*/ S, /*?}*/T, M> renderer, RenderLayer renderLayer); } public static void registerRenderLayer(Consumer registry) { //? if fabric { - LivingEntityFeatureRendererRegistrationCallback.EVENT.register((a, b, c, d)-> registry.accept(new FactoryRenderLayerRegistry() { + LivingEntityRenderLayerRegistrationCallback.EVENT.register((a, b, c, d)-> registry.accept(new FactoryRenderLayerRegistry() { @Override - public EntityRenderer=1.21.2 {*//*, ? *//*?}*/> getEntityRenderer(EntityType entityType) { + public EntityRenderer=1.21.2 {*/, ? /*?}*/> getEntityRenderer(EntityType entityType) { return b; } @@ -566,7 +547,7 @@ public EntityModelSet getEntityModelSet() { return d.getModelSet(); } - public =1.21.2 {*/ /*LivingEntityRenderState, S extends *//*?}*/LivingEntity,M extends EntityModel> void register(LivingEntityRenderer=1.21.2 {*/ /*S, *//*?}*/T, M> renderer, RenderLayer renderLayer) { + public =1.21.2 {*/ LivingEntityRenderState, S extends /*?}*/LivingEntity,M extends EntityModel> void register(LivingEntityRenderer=1.21.2 {*/ S, /*?}*/T, M> renderer, RenderLayer renderLayer) { c.register(renderLayer); } diff --git a/src/main/java/wily/factoryapi/FactoryAPIPlatform.java b/src/main/java/wily/factoryapi/FactoryAPIPlatform.java index 35f3051..6dfcc3e 100644 --- a/src/main/java/wily/factoryapi/FactoryAPIPlatform.java +++ b/src/main/java/wily/factoryapi/FactoryAPIPlatform.java @@ -1,27 +1,19 @@ package wily.factoryapi; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; import com.mojang.brigadier.arguments.ArgumentType; -import io.netty.buffer.Unpooled; -import net.minecraft.commands.synchronization.ArgumentTypeInfos; import net.minecraft.core.*; import net.minecraft.core.registries.Registries; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceKey; import net.minecraft.server.MinecraftServer; import net.minecraft.server.packs.repository.Pack; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import org.jetbrains.annotations.NotNull; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; //? if forge { /*import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; @@ -53,23 +45,18 @@ import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; *///?} elif fabric { -import net.fabricmc.api.EnvType; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; -import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext; //? if <1.21.11 { -import net.fabricmc.fabric.mixin.command.ArgumentTypesAccessor; -//?} else { -/*import net.fabricmc.fabric.mixin.command.ArgumentTypeInfosAccessor; -*///?} +/*import net.fabricmc.fabric.mixin.command.ArgumentTypesAccessor; +*///?} else { +import net.fabricmc.fabric.mixin.command.ArgumentTypeInfosAccessor; +//?} import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; import net.fabricmc.loader.api.metadata.Person; @@ -126,26 +113,16 @@ import net.minecraft.ChatFormatting; import net.minecraft.commands.synchronization.ArgumentTypeInfo; import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; import wily.factoryapi.base.*; -import wily.factoryapi.base.network.CommonNetwork; -import wily.factoryapi.util.FluidInstance; import wily.factoryapi.util.ListMap; import wily.factoryapi.util.ModInfo; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URL; -import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; import java.util.stream.Stream; public interface FactoryAPIPlatform { @@ -176,8 +153,8 @@ static Component getPlatformEnergyComponent() { /*throw new AssertionError();*/ } - static T getRegistryValue(ResourceLocation location, Registry registry) { - return registry./*? if <1.21.2 {*/get/*?} else {*//*getValue*//*?}*/(location); + static T getRegistryValue(Identifier location, Registry registry) { + return registry./*? if <1.21.2 {*//*get*//*?} else {*/getValue/*?}*/(location); } static Optional> getRegistryValue(RegistryAccess access, ResourceKey resourceKey) { @@ -188,24 +165,24 @@ static BlockBehaviour.Properties setupBlockProperties(BlockBehaviour.Properties return setupBlockProperties(properties, blockHolder.getId()); } - static BlockBehaviour.Properties setupBlockProperties(BlockBehaviour.Properties properties, ResourceLocation id) { - return properties/*? if >=1.21.2 {*//*.setId(ResourceKey.create(Registries.BLOCK, id))*//*?}*/; + static BlockBehaviour.Properties setupBlockProperties(BlockBehaviour.Properties properties, Identifier id) { + return properties/*? if >=1.21.2 {*/.setId(ResourceKey.create(Registries.BLOCK, id))/*?}*/; } static Item.Properties setupItemProperties(Item.Properties properties, RegisterListing.Holder itemHolder) { return setupItemProperties(properties, itemHolder.getId()); } - static Item.Properties setupItemProperties(Item.Properties properties, ResourceLocation id) { - return properties/*? if >=1.21.2 {*//*.setId(ResourceKey.create(Registries.ITEM, id)).useItemDescriptionPrefix()*//*?}*/; + static Item.Properties setupItemProperties(Item.Properties properties, Identifier id) { + return properties/*? if >=1.21.2 {*/.setId(ResourceKey.create(Registries.ITEM, id)).useItemDescriptionPrefix()/*?}*/; } static Item.Properties setupBlockItemProperties(Item.Properties properties, RegisterListing.Holder blockHolder) { return setupBlockItemProperties(properties, blockHolder.getId()); } - static Item.Properties setupBlockItemProperties(Item.Properties properties, ResourceLocation id) { - return properties/*? if >=1.21.2 {*//*.setId(ResourceKey.create(Registries.ITEM, id)).useBlockDescriptionPrefix()*//*?}*/; + static Item.Properties setupBlockItemProperties(Item.Properties properties, Identifier id) { + return properties/*? if >=1.21.2 {*/.setId(ResourceKey.create(Registries.ITEM, id)).useBlockDescriptionPrefix()/*?}*/; } @FunctionalInterface @@ -214,7 +191,7 @@ interface BlockEntitySupplier { } static BlockEntityType createBlockEntityType(BlockEntitySupplier supplier, Block... blocks) { - return /*? if <1.21.2 {*/BlockEntityType.Builder.of(supplier::create, blocks).build(null)/*?} else {*/ /*new BlockEntityType<>(supplier::create, Set.of(blocks))*//*?}*/; + return /*? if <1.21.2 {*//*BlockEntityType.Builder.of(supplier::create, blocks).build(null)*//*?} else {*/ new BlockEntityType<>(supplier::create, Set.of(blocks))/*?}*/; } static IPlatformFluidHandler getItemFluidHandler(ItemStack container) { @@ -289,7 +266,7 @@ static ICraftyEnergyStorage getItemCraftyEnergyStorageApi(ItemStack container) { /*static RegisterListing.Holder deferredToRegisterHolder(RegistryObject holder) { return new RegisterListing.Holder<>() { @Override - public ResourceLocation getId() { + public Identifier getId() { return holder.getId(); } @Override @@ -320,7 +297,7 @@ static BusGroup getForgeEventBus() { /*static RegisterListing.Holder deferredToRegisterHolder(DeferredHolder holder) { return new RegisterListing.Holder<>() { @Override - public ResourceLocation getId() { + public Identifier getId() { return holder.getId(); } @Override @@ -437,7 +414,7 @@ static boolean isClient() { static , T extends ArgumentTypeInfo.Template, I extends ArgumentTypeInfo> void registerByClassArgumentType(Class infoClass, I argumentTypeInfo) { //? if fabric { - /*? if <1.21.11 {*/ArgumentTypesAccessor/*?} else {*//*ArgumentTypeInfosAccessor*//*?}*/.fabric_getClassMap().put(infoClass,argumentTypeInfo); + /*? if <1.21.11 {*//*ArgumentTypesAccessor*//*?} else {*/ArgumentTypeInfosAccessor/*?}*/.fabric_getClassMap().put(infoClass,argumentTypeInfo); //?} else if forge || neoforge { /*ArgumentTypeInfos.registerByClass(infoClass,argumentTypeInfo); *///?} else @@ -466,12 +443,12 @@ public void register() { forEach(o-> Registry.register(registry,o.getId(),o.get())); } @Override - public Holder add(String name, Function supplier) { - ResourceLocation id = FactoryAPI.createLocation(getNamespace(), name); + public Holder add(String name, Function supplier) { + Identifier id = FactoryAPI.createLocation(getNamespace(), name); Holder h = new Holder<>() { V obj; @Override - public ResourceLocation getId() { + public Identifier getId() { return id; } @@ -515,7 +492,7 @@ public void register() { REGISTER.register(getModEventBus()); } @Override - public Holder add(String name, Function supplier) { + public Holder add(String name, Function supplier) { return deferredToRegisterHolder(REGISTER.register(name,()-> supplier.apply(FactoryAPI.createLocation(getNamespace(), name)))); } @NotNull @@ -713,6 +690,6 @@ public String getName() { } static boolean isPackHidden(Pack pack) { - return /*? if fabric && >=1.20.4 && <1.21.11 {*/ ((net.fabricmc.fabric.impl.resource.loader.FabricResourcePackProfile)pack).fabric_isHidden() /*?} else {*/ /*false*//*?}*/; + return /*? if fabric && >=1.20.4 && <1.21.11 {*/ /*((net.fabricmc.fabric.impl.resource.loader.FabricResourcePackProfile)pack).fabric_isHidden() *//*?} else {*/ false/*?}*/; } } diff --git a/src/main/java/wily/factoryapi/FactoryEvent.java b/src/main/java/wily/factoryapi/FactoryEvent.java index 9abd0d9..65b058f 100644 --- a/src/main/java/wily/factoryapi/FactoryEvent.java +++ b/src/main/java/wily/factoryapi/FactoryEvent.java @@ -2,9 +2,9 @@ //? if fabric { //? if >=1.20.5 { -/*import net.fabricmc.fabric.api.item.v1.DefaultItemComponentEvents; +import net.fabricmc.fabric.api.item.v1.DefaultItemComponentEvents; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; -*///?} +//?} import net.fabricmc.api.EnvType; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.event.lifecycle.v1.CommonLifecycleEvents; @@ -65,12 +65,12 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload; //? if >=1.20.5 { -/*import net.minecraft.core.component.DataComponentType; +import net.minecraft.core.component.DataComponentType; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.server.packs.PackLocationInfo; import net.minecraft.server.packs.PackSelectionConfig; import net.minecraft.server.packs.repository.KnownPack; -*///?} +//?} import net.minecraft.SharedConstants; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.packs.PathPackResources; @@ -80,7 +80,7 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.repository.Pack; @@ -230,10 +230,10 @@ public static void afterServerTick(Consumer apply) { public static void registerReloadListener(PackType type, PreparableReloadListener reloadListener){ //? if fabric { - ResourceLocation location = FactoryAPI.createLocation(reloadListener.getName()); + Identifier location = FactoryAPI.createLocation(reloadListener.getName()); ResourceManagerHelper.get(type).registerReloadListener(new IdentifiableResourceReloadListener() { @Override - public ResourceLocation getFabricId() { + public Identifier getFabricId() { return location; } @@ -243,16 +243,16 @@ public String getName() { } //? if >=1.21.9 { - /*@Override + @Override public CompletableFuture reload(SharedState sharedState, Executor executor, PreparationBarrier preparationBarrier, Executor executor2) { return reloadListener.reload(sharedState, executor, preparationBarrier, executor2); } - *///?} else { - @Override - public CompletableFuture reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, /*? if <1.21.2 {*/ProfilerFiller profilerFiller, ProfilerFiller profilerFiller2,/*?}*/ Executor executor, Executor executor2) { - return reloadListener.reload(preparationBarrier,resourceManager,/*? if <1.21.2 {*/profilerFiller, profilerFiller2,/*?}*/executor,executor2); + //?} else { + /*@Override + public CompletableFuture reload(PreparationBarrier preparationBarrier, ResourceManager resourceManager, /^? if <1.21.2 {^//^ProfilerFiller profilerFiller, ProfilerFiller profilerFiller2,^//^?}^/ Executor executor, Executor executor2) { + return reloadListener.reload(preparationBarrier,resourceManager,/^? if <1.21.2 {^//^profilerFiller, profilerFiller2,^//^?}^/executor,executor2); } - //?} + *///?} }); //?} elif forge && <1.21.6 { /*if (type == PackType.CLIENT_RESOURCES) FactoryAPIClient.registerReloadListener(reloadListener); @@ -282,11 +282,11 @@ public static void registerCommands(TriConsumer new PathPackResources(s, resourcePath,true), type, position, PackSource.create(PackSource.BUILT_IN::decorate, defaultEnabled)); *///?} else if <1.20.5 { - return Pack.readMetaAndCreate(name.toString(), displayName,false, new PathPackResources.PathResourcesSupplier(resourcePath,true), type, position, PackSource.create(PackSource.BUILT_IN::decorate, defaultEnabled)); - //?} else { - /*return Pack.readMetaAndCreate(new PackLocationInfo( name.toString(), displayName,PackSource.create(PackSource.BUILT_IN::decorate, defaultEnabled), Optional.of(new KnownPack(name.getNamespace(),name.toString(), SharedConstants.getCurrentVersion()/^? if <1.21.6 {^/.getId()/^?} else {^//^.id()^//^?}^/))), new PathPackResources.PathResourcesSupplier(resourcePath), type, new PackSelectionConfig(false,position,false)); - *///?} + /*return Pack.readMetaAndCreate(name.toString(), displayName,false, new PathPackResources.PathResourcesSupplier(resourcePath,true), type, position, PackSource.create(PackSource.BUILT_IN::decorate, defaultEnabled)); + *///?} else { + return Pack.readMetaAndCreate(new PackLocationInfo( name.toString(), displayName,PackSource.create(PackSource.BUILT_IN::decorate, defaultEnabled), Optional.of(new KnownPack(name.getNamespace(),name.toString(), SharedConstants.getCurrentVersion()/*? if <1.21.6 {*//*.getId()*//*?} else {*/.id()/*?}*/))), new PathPackResources.PathResourcesSupplier(resourcePath), type, new PackSelectionConfig(false,position,false)); + //?} } public static void registerBuiltInPacks(Consumer registry){ @@ -360,17 +360,17 @@ public static void registerPayload(Consumer registry){ @Override public void register(boolean c2s, CommonNetwork.Identifier id) { //? <1.20.5 { - if (c2s) ServerPlayNetworking.registerGlobalReceiver(id.location(), (m, l, h, b, s) -> id.decode(b).applyServer(()->h.player)); + /*if (c2s) ServerPlayNetworking.registerGlobalReceiver(id.location(), (m, l, h, b, s) -> id.decode(b).applyServer(()->h.player)); else if (FactoryAPI.isClient()) FactoryAPIClient.registerPayload(id); - //?} else { - /*if (c2s) { - PayloadTypeRegistry.playC2S().register(id.type(),id.codec()); + *///?} else { + if (c2s) { + PayloadTypeRegistry.serverboundPlay().register(id.type(),id.codec()); ServerPlayNetworking.registerGlobalReceiver(id.type(), (payload, context)-> payload.applyServer(context::player)); }else { - PayloadTypeRegistry.playS2C().register(id.type(),id.codec()); + PayloadTypeRegistry.clientboundPlay().register(id.type(),id.codec()); if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) FactoryAPIClient.registerPayload(id); } - *///?} + //?} } }); //?} elif forge { @@ -411,20 +411,20 @@ public void register(boolean c2s, CommonNetwor } //? if >=1.20.5 { - /*public static void setItemComponent(Item item, DataComponentType type, C value){ + public static void setItemComponent(Item item, DataComponentType type, C value){ //? if fabric { DefaultItemComponentEvents.MODIFY.register(c-> c.modify(item, bc-> bc.set(type,value))); //?} elif forge && <1.21.6 { - /^MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, GatherComponentsEvent.class, e-> { + /*MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, GatherComponentsEvent.class, e-> { if (e.getOwner() == item) e.register(type,value); }); - ^///?} elif forge { - /^GatherComponentsEvent.BUS.addListener(e-> { + *///?} elif forge { + /*GatherComponentsEvent.BUS.addListener(e-> { if (e.getOwner() == item) e.register(type,value); }); - ^///?} elif neoforge { - /^FactoryAPIPlatform.getModEventBus().addListener(ModifyDefaultComponentsEvent.class, e-> e.modify(item, bc-> bc.set(type,value))); - ^///?} + *///?} elif neoforge { + /*FactoryAPIPlatform.getModEventBus().addListener(ModifyDefaultComponentsEvent.class, e-> e.modify(item, bc-> bc.set(type,value))); + *///?} } - *///?} + //?} } diff --git a/src/main/java/wily/factoryapi/ItemContainerPlatform.java b/src/main/java/wily/factoryapi/ItemContainerPlatform.java index d5e5ccf..1b4a985 100644 --- a/src/main/java/wily/factoryapi/ItemContainerPlatform.java +++ b/src/main/java/wily/factoryapi/ItemContainerPlatform.java @@ -70,7 +70,7 @@ public ItemEnergyContext(ItemStack container) { static Fluid getBucketFluid(BucketItem item) { //? if fabric { - return ((BucketItemAccessor)item).fabric_getFluid(); + return ((BucketItemAccessor)item).fabric_getContent(); //?} elif forge || neoforge && <1.21 { /*return item.getFluid(); *///?} else if neoforge { diff --git a/src/main/java/wily/factoryapi/base/FactoryCapacityTier.java b/src/main/java/wily/factoryapi/base/FactoryCapacityTier.java index 79aca0d..9a2f411 100644 --- a/src/main/java/wily/factoryapi/base/FactoryCapacityTier.java +++ b/src/main/java/wily/factoryapi/base/FactoryCapacityTier.java @@ -6,7 +6,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; //? if >=1.20.5 -//import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.codec.StreamCodec; import net.minecraft.util.StringRepresentable; import wily.factoryapi.FactoryAPI; @@ -21,7 +21,7 @@ public enum FactoryCapacityTier implements StringRepresentable { public static final Codec CODEC = StringRepresentable.fromEnum(FactoryCapacityTier::values); //? if >=1.20.5 - //public static final StreamCodec STREAM_CODEC = StreamCodec.of(FriendlyByteBuf::writeEnum, b->b.readEnum(FactoryCapacityTier.class)); + public static final StreamCodec STREAM_CODEC = StreamCodec.of(FriendlyByteBuf::writeEnum, b->b.readEnum(FactoryCapacityTier.class)); public final ChatFormatting formatting; private final double conductivity; diff --git a/src/main/java/wily/factoryapi/base/FactoryIngredient.java b/src/main/java/wily/factoryapi/base/FactoryIngredient.java index ed38b9f..a9dbcb5 100644 --- a/src/main/java/wily/factoryapi/base/FactoryIngredient.java +++ b/src/main/java/wily/factoryapi/base/FactoryIngredient.java @@ -1,10 +1,10 @@ package wily.factoryapi.base; //? if >=1.20.5 { -/*import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -*///?} -import net.minecraft.resources.ResourceLocation; +//?} +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -18,10 +18,10 @@ import java.util.function.Supplier; public interface FactoryIngredient extends Predicate,CommonNetwork.Payload { - ListMap> map = new ListMap<>(); + ListMap> map = new ListMap<>(); //? if >=1.20.5 { - /*StreamCodec CODEC = StreamCodec.of((b,i)-> encode(()->b,i), b-> decode(()->b)); - *///?} + StreamCodec CODEC = StreamCodec.of((b,i)-> encode(()->b,i), b-> decode(()->b)); + //?} CommonNetwork.Identifier DEFAULT_ID = CommonNetwork.Identifier.create(FactoryAPI.createVanillaLocation("ingredient"),FactoryIngredient::decodeDefaultIngredient); static void init() { @@ -51,15 +51,15 @@ default void apply(Context context) { int getCount(); static void encode(CommonNetwork.PlayBuf buf, FactoryIngredient ingredient){ - buf.get().writeResourceLocation(ingredient.identifier().location()); + buf.get().writeIdentifier(ingredient.identifier().location()); ingredient.encode(buf); } static FactoryIngredient decode(CommonNetwork.PlayBuf buf){ - CommonNetwork.Identifier id = map.getOrDefault(buf.get().readResourceLocation(),DEFAULT_ID); + CommonNetwork.Identifier id = map.getOrDefault(buf.get().readIdentifier(),DEFAULT_ID); return id.decode(buf.get()); } static FactoryIngredient decodeDefaultIngredient(CommonNetwork.PlayBuf buf){ - return FactoryIngredient.of(/*? >=1.20.5 {*//*Ingredient.CONTENTS_STREAM_CODEC.decode(buf.get())*//*?} else {*/ Ingredient.fromNetwork(buf.get())/*?}*/); + return FactoryIngredient.of(/*? >=1.20.5 {*/Ingredient.CONTENTS_STREAM_CODEC.decode(buf.get())/*?} else {*/ /*Ingredient.fromNetwork(buf.get())*//*?}*/); } } diff --git a/src/main/java/wily/factoryapi/base/FactoryItemEnergyStorage.java b/src/main/java/wily/factoryapi/base/FactoryItemEnergyStorage.java index 7836a28..2296456 100644 --- a/src/main/java/wily/factoryapi/base/FactoryItemEnergyStorage.java +++ b/src/main/java/wily/factoryapi/base/FactoryItemEnergyStorage.java @@ -10,7 +10,7 @@ public FactoryItemEnergyStorage(ItemStack stack, int initialEnergy, int capacity super(capacity,null,transportState); this.container = stack; //? if <1.20.5 - if (!stack.getOrCreateTag().contains(KEY)) setEnergyStored(initialEnergy); + //if (!stack.getOrCreateTag().contains(KEY)) setEnergyStored(initialEnergy); this.maxOutput = maxOutput; this.maxInput = maxInput; } @@ -42,17 +42,17 @@ public int consumeEnergy(int consume, boolean simulate) { @Override public int getEnergyStored() { - return /*? if <1.20.5 {*/container.getOrCreateTag().getInt(KEY)/*?} else {*/ /*container.getOrDefault(FactoryRegistries.ENERGY_COMPONENT.get(),0)*//*?}*/; + return /*? if <1.20.5 {*//*container.getOrCreateTag().getInt(KEY)*//*?} else {*/ container.getOrDefault(FactoryRegistries.ENERGY_COMPONENT.get(),0)/*?}*/; } public void setEnergyStored(int energy) { //? if <1.20.5 { - container.getOrCreateTag().putInt(KEY,energy); - //?} else - //container.set(FactoryRegistries.ENERGY_COMPONENT.get(),energy); + /*container.getOrCreateTag().putInt(KEY,energy); + *///?} else + container.set(FactoryRegistries.ENERGY_COMPONENT.get(),energy); } //? if <1.20.5 { - @Override + /*@Override public CompoundTag serializeTag() { return container.getOrCreateTag(); } @@ -61,7 +61,7 @@ public CompoundTag serializeTag() { public void deserializeTag(CompoundTag nbt) { this.container.setTag(nbt); } - //?} + *///?} public int getMaxConsume(){ return Math.min(getEnergyStored(),maxOutput); diff --git a/src/main/java/wily/factoryapi/base/FactoryItemFluidHandler.java b/src/main/java/wily/factoryapi/base/FactoryItemFluidHandler.java index 31cc9eb..0bec26b 100644 --- a/src/main/java/wily/factoryapi/base/FactoryItemFluidHandler.java +++ b/src/main/java/wily/factoryapi/base/FactoryItemFluidHandler.java @@ -1,10 +1,10 @@ package wily.factoryapi.base; //? if >=1.20.5 { -/*import net.minecraft.core.component.DataComponentType; +import net.minecraft.core.component.DataComponentType; import net.minecraft.core.component.DataComponents; import net.minecraft.world.item.component.CustomData; -*///?} +//?} import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -16,13 +16,13 @@ import wily.factoryapi.util.FluidInstance; //? if >=1.21.9 { -/*import net.minecraft.world.item.component.TypedEntityData; -*///?} +import net.minecraft.world.item.component.TypedEntityData; +//?} import java.util.function.Function; import java.util.function.Predicate; //? if <1.20.5 -import static net.minecraft.world.item.BlockItem.BLOCK_ENTITY_TAG; +//import static net.minecraft.world.item.BlockItem.BLOCK_ENTITY_TAG; public class FactoryItemFluidHandler extends FactoryFluidHandler implements IPlatformItemFluidHandler { private final ItemStack container; @@ -39,10 +39,10 @@ public FactoryItemFluidHandler(int capacity, ItemStack stack, Predicate=1.21.9 { - /^CompoundTag beTag = container.has(DataComponents.BLOCK_ENTITY_DATA) ? container.get(DataComponents.BLOCK_ENTITY_DATA).copyTagWithoutId() : new CompoundTag(); - ^///?} else { - CompoundTag beTag = container.getOrDefault(DataComponents.BLOCK_ENTITY_DATA, CustomData.EMPTY).copyTag(); - //?} + CompoundTag beTag = container.has(DataComponents.BLOCK_ENTITY_DATA) ? container.get(DataComponents.BLOCK_ENTITY_DATA).copyTagWithoutId() : new CompoundTag(); + //?} else { + /*CompoundTag beTag = container.getOrDefault(DataComponents.BLOCK_ENTITY_DATA, CustomData.EMPTY).copyTag(); + *///?} CompoundTag tag = FluidInstance.toTag(fluid); tag.putInt("capacity", capacity); beTag.put(getStorageKey(), tag); //? if >=1.21.9 { - /^//TODO Check if this will cause problems when placing the block + //TODO Check if this will cause problems when placing the block container.set(DataComponents.BLOCK_ENTITY_DATA, TypedEntityData.of(BlockEntityType.CHEST, beTag)); - ^///?} else { - container.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(beTag)); - //?} + //?} else { + /*container.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(beTag)); + *///?} } else { container.set(FactoryRegistries.FLUID_INSTANCE_COMPONENT.get(), fluid); } - *///?} + //?} } @Override public @NotNull FluidInstance getFluidInstance() { - return /*? if <1.20.5 {*/FluidInstance.fromTag(getFluidCompound(container))/*?} else {*/ /*isBlockItem() ? getFromComponentOrDefault(container,DataComponents.BLOCK_ENTITY_DATA, /^? if >=1.21.9 {^//^TypedEntityData::copyTagWithoutId^//^?} else {^/CustomData::copyTag/^?}^/, c-> FluidInstance.fromTag(CompoundTagUtil.getCompoundTagOrEmpty(c, getStorageKey())),c-> c.contains(getStorageKey()), FluidInstance.empty()) : container.getOrDefault(FactoryRegistries.FLUID_INSTANCE_COMPONENT.get(), FluidInstance.empty())*//*?}*/; + return /*? if <1.20.5 {*//*FluidInstance.fromTag(getFluidCompound(container))*//*?} else {*/ isBlockItem() ? getFromComponentOrDefault(container,DataComponents.BLOCK_ENTITY_DATA, /*? if >=1.21.9 {*/TypedEntityData::copyTagWithoutId/*?} else {*//*CustomData::copyTag*//*?}*/, c-> FluidInstance.fromTag(CompoundTagUtil.getCompoundTagOrEmpty(c, getStorageKey())),c-> c.contains(getStorageKey()), FluidInstance.empty()) : container.getOrDefault(FactoryRegistries.FLUID_INSTANCE_COMPONENT.get(), FluidInstance.empty())/*?}*/; } //? if <1.20.5 { - @Override + /*@Override public void deserializeTag(CompoundTag tag) { getFluidCompound(container).put(getStorageKey(),tag); } @@ -101,12 +101,12 @@ public void deserializeTag(CompoundTag tag) { public CompoundTag serializeTag() { return getFluidCompound(container); } - //?} else { - /*public static T getFromComponentOrDefault(ItemStack stack, DataComponentType type, Function getter, Function mapper, Predicate allow, T obj){ + *///?} else { + public static T getFromComponentOrDefault(ItemStack stack, DataComponentType type, Function getter, Function mapper, Predicate allow, T obj){ D d; return !stack.has(type) || !allow.test(d=getter.apply(stack.get(type))) ? obj : mapper.apply(d); } - *///?} + //?} @Override public int fill(FluidInstance resource, boolean simulate) { if (container.getCount() != 1 || resource.isEmpty() || !isFluidValid(resource)){ @@ -170,48 +170,48 @@ public int fill(FluidInstance resource, boolean simulate) { protected void setContainerToEmpty() { //? if <1.20.5 { - container.removeTagKey(getStorageKey()); - //?} else { - /*container.remove(FactoryRegistries.FLUID_INSTANCE_COMPONENT.get()); + /*container.removeTagKey(getStorageKey()); + *///?} else { + container.remove(FactoryRegistries.FLUID_INSTANCE_COMPONENT.get()); container.remove(FactoryRegistries.FLUID_CAPACITY_COMPONENT.get()); - *///?} + //?} } @Override public void setCapacity(int capacity) { boolean b = isBlockItem(); //? if <1.20.5 { - CompoundTag tag = container.getOrCreateTag(); + /*CompoundTag tag = container.getOrCreateTag(); if (b) tag = tag.getCompound(BLOCK_ENTITY_TAG); CompoundTag newTag = getFluidCompound(container); newTag.putInt("capacity",capacity); tag.put(getStorageKey(), newTag); if (b) container.getTag().put(BLOCK_ENTITY_TAG, tag); - //?} else { - /*if (b) { + *///?} else { + if (b) { //? if >=1.21.9 { - /^CompoundTag beTag = container.has(DataComponents.BLOCK_ENTITY_DATA) ? container.get(DataComponents.BLOCK_ENTITY_DATA).copyTagWithoutId() : new CompoundTag(); - ^///?} else { - CompoundTag beTag = container.getOrDefault(DataComponents.BLOCK_ENTITY_DATA, CustomData.EMPTY).copyTag(); - //?} + CompoundTag beTag = container.has(DataComponents.BLOCK_ENTITY_DATA) ? container.get(DataComponents.BLOCK_ENTITY_DATA).copyTagWithoutId() : new CompoundTag(); + //?} else { + /*CompoundTag beTag = container.getOrDefault(DataComponents.BLOCK_ENTITY_DATA, CustomData.EMPTY).copyTag(); + *///?} CompoundTag tag = CompoundTagUtil.getCompoundTagOrEmpty(beTag, getStorageKey()); tag.putInt("capacity",capacity); beTag.put(getStorageKey(),tag); //? if >=1.21.9 { - /^//TODO Check if this will cause problems when placing the block + //TODO Check if this will cause problems when placing the block container.set(DataComponents.BLOCK_ENTITY_DATA, TypedEntityData.of(BlockEntityType.CHEST, beTag)); - ^///?} else { - container.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(beTag)); - //?} + //?} else { + /*container.set(DataComponents.BLOCK_ENTITY_DATA, CustomData.of(beTag)); + *///?} } else { container.set(FactoryRegistries.FLUID_CAPACITY_COMPONENT.get(), capacity); } - *///?} + //?} } @Override public int getMaxFluid() { - return /*? if <1.20.5 {*/ getFluidCompound(container).contains("capacity") ? getFluidCompound(container).getInt("capacity") : super.getMaxFluid() /*?} else {*/ /*isBlockItem() ? getFromComponentOrDefault(container,DataComponents.BLOCK_ENTITY_DATA, /^? if >=1.21.9 {^//^TypedEntityData::copyTagWithoutId^//^?} else {^/CustomData::copyTag/^?}^/, c-> CompoundTagUtil.getInt(c, getStorageKey()).orElse(0),c-> c.contains(getStorageKey()), super.getMaxFluid()) : container.getOrDefault(FactoryRegistries.FLUID_CAPACITY_COMPONENT.get(),super.getMaxFluid()) *//*?}*/; + return /*? if <1.20.5 {*/ /*getFluidCompound(container).contains("capacity") ? getFluidCompound(container).getInt("capacity") : super.getMaxFluid() *//*?} else {*/ isBlockItem() ? getFromComponentOrDefault(container,DataComponents.BLOCK_ENTITY_DATA, /*? if >=1.21.9 {*/TypedEntityData::copyTagWithoutId/*?} else {*//*CustomData::copyTag*//*?}*/, c-> CompoundTagUtil.getInt(c, getStorageKey()).orElse(0),c-> c.contains(getStorageKey()), super.getMaxFluid()) : container.getOrDefault(FactoryRegistries.FLUID_CAPACITY_COMPONENT.get(),super.getMaxFluid()) /*?}*/; } @Override diff --git a/src/main/java/wily/factoryapi/base/FactoryItemHandler.java b/src/main/java/wily/factoryapi/base/FactoryItemHandler.java index 10258ee..b0f786d 100644 --- a/src/main/java/wily/factoryapi/base/FactoryItemHandler.java +++ b/src/main/java/wily/factoryapi/base/FactoryItemHandler.java @@ -1,13 +1,11 @@ package wily.factoryapi.base; //? if fabric { -import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; +import net.fabricmc.fabric.api.transfer.v1.item.ContainerStorage; import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; import net.fabricmc.fabric.api.transfer.v1.storage.Storage; //?} -import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; import net.minecraft.world.Container; import net.minecraft.world.ContainerHelper; import net.minecraft.world.SimpleContainer; @@ -15,19 +13,15 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; //? if >=1.21.6 { -/*import net.minecraft.world.level.storage.TagValueInput; +import net.minecraft.world.level.storage.TagValueInput; import net.minecraft.world.level.storage.TagValueOutput; -import net.minecraft.world.level.storage.ValueOutput; import net.minecraft.util.ProblemReporter; -*///?} +//?} import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.NotNull; -import wily.factoryapi.FactoryAPI; import wily.factoryapi.FactoryAPIPlatform; import wily.factoryapi.util.FactoryItemUtil; -import java.util.function.BiPredicate; - public class FactoryItemHandler extends SimpleContainer implements IPlatformItemHandler { protected BlockEntity be; protected TransportState transportState; @@ -153,7 +147,7 @@ public void setChanged() { @Override public CompoundTag serializeTag() { //? if <1.20.5 { - ListTag nbtTagList = new ListTag(); + /*ListTag nbtTagList = new ListTag(); for(int i = 0; i < getContainerSize(); ++i) { if (!getItem(i).isEmpty()) { @@ -167,15 +161,15 @@ public CompoundTag serializeTag() { CompoundTag nbt = new CompoundTag(); nbt.put("Items", nbtTagList); return nbt; - //?} else { - /*//? if <1.21.6 { - return ContainerHelper.saveAllItems(new CompoundTag(),getItems(), FactoryAPIPlatform.getRegistryAccess()); - //?} else { - /^TagValueOutput withoutContext = TagValueOutput.createWithoutContext(ProblemReporter.DISCARDING); + *///?} else { + //? if <1.21.6 { + /*return ContainerHelper.saveAllItems(new CompoundTag(),getItems(), FactoryAPIPlatform.getRegistryAccess()); + *///?} else { + TagValueOutput withoutContext = TagValueOutput.createWithoutContext(ProblemReporter.DISCARDING); ContainerHelper.saveAllItems(withoutContext,getItems(), true); return withoutContext.buildResult(); - ^///?} - *///?} + //?} + //?} } @Override @@ -186,7 +180,7 @@ public boolean stillValid(@NotNull Player player) { @Override public void deserializeTag(CompoundTag tag) { //? if <1.20.5 { - ListTag tagList = tag.getList("Items", 10); + /*ListTag tagList = tag.getList("Items", 10); for(int i = 0; i < tagList.size(); ++i) { CompoundTag itemTags = tagList.getCompound(i); @@ -195,13 +189,13 @@ public void deserializeTag(CompoundTag tag) { setItem(slot, ItemStack.of(itemTags)); } } - //?} else { - /*//? if <1.21.6 { - ContainerHelper.loadAllItems(tag,getItems(), FactoryAPIPlatform.getRegistryAccess()); - //?} else { - /^ContainerHelper.loadAllItems(TagValueInput.create(ProblemReporter.DISCARDING, FactoryAPIPlatform.getRegistryAccess(), tag), getItems()); - ^///?} - *///?} + *///?} else { + //? if <1.21.6 { + /*ContainerHelper.loadAllItems(tag,getItems(), FactoryAPIPlatform.getRegistryAccess()); + *///?} else { + ContainerHelper.loadAllItems(TagValueInput.create(ProblemReporter.DISCARDING, FactoryAPIPlatform.getRegistryAccess(), tag), getItems()); + //?} + //?} } @Override @@ -220,7 +214,7 @@ public boolean isRemoved() { } //? if fabric { - protected final InventoryStorage inventoryStorage = InventoryStorage.of(this, null); + protected final ContainerStorage inventoryStorage = ContainerStorage.of(this, null); @Override public Storage getHandler() { diff --git a/src/main/java/wily/factoryapi/base/FactoryRenderingTextCollector.java b/src/main/java/wily/factoryapi/base/FactoryRenderingTextCollector.java index 5b72a4b..49463e5 100644 --- a/src/main/java/wily/factoryapi/base/FactoryRenderingTextCollector.java +++ b/src/main/java/wily/factoryapi/base/FactoryRenderingTextCollector.java @@ -1,9 +1,9 @@ //? if >=1.21.11 { -/*package wily.factoryapi.base; +package wily.factoryapi.base; import net.minecraft.client.gui.GuiGraphics; public interface FactoryRenderingTextCollector { GuiGraphics getGuiGraphics(); } -*///?} \ No newline at end of file +//?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/base/FactoryStorage.java b/src/main/java/wily/factoryapi/base/FactoryStorage.java index 130f9dd..cce64d7 100644 --- a/src/main/java/wily/factoryapi/base/FactoryStorage.java +++ b/src/main/java/wily/factoryapi/base/FactoryStorage.java @@ -1,14 +1,14 @@ package wily.factoryapi.base; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import wily.factoryapi.FactoryAPI; import wily.factoryapi.util.ListMap; public record FactoryStorage(Class type) { - public static final ListMap> STORAGES = new ListMap<>(); + public static final ListMap> STORAGES = new ListMap<>(); - public static > T register(ResourceLocation location, T storage){ + public static > T register(Identifier location, T storage){ STORAGES.put(location,storage); return storage; } diff --git a/src/main/java/wily/factoryapi/base/FuelManager.java b/src/main/java/wily/factoryapi/base/FuelManager.java index 633a9f8..b26cfc4 100644 --- a/src/main/java/wily/factoryapi/base/FuelManager.java +++ b/src/main/java/wily/factoryapi/base/FuelManager.java @@ -2,13 +2,12 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; //? fabric { //? if <1.21.2 { -import net.fabricmc.fabric.api.registry.FuelRegistry; -//?} else { -/*import net.fabricmc.fabric.api.registry.FuelRegistryEvents; -*///?} +/*import net.fabricmc.fabric.api.registry.FuelRegistry; +*///?} else { +import net.fabricmc.fabric.api.registry.FuelValueEvents; +//?} //?} else if forge { /*import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.ForgeEventFactory; @@ -21,16 +20,14 @@ import net.neoforged.bus.api.EventPriority; *///?} //? if >=1.21.2 { -/*import wily.factoryapi.mixin.base.FuelValuesAccessor; +import wily.factoryapi.mixin.base.FuelValuesAccessor; import net.minecraft.world.level.block.entity.FuelValues; -*///?} +//?} import wily.factoryapi.FactoryAPI; import wily.factoryapi.FactoryAPIClient; -import wily.factoryapi.FactoryAPIPlatform; import java.util.Collections; import java.util.Map; -import java.util.Objects; public class FuelManager { @@ -44,18 +41,18 @@ public static int getBurnTime(Item item){ * */ public static Map getMap(){ //? if <1.21.2 { - return AbstractFurnaceBlockEntity.getFuel(); - //?} else { - /*FuelValues fuelValues = getFuelValues(); + /*return AbstractFurnaceBlockEntity.getFuel(); + *///?} else { + FuelValues fuelValues = getFuelValues(); return fuelValues == null ? Collections.emptyMap() : ((FuelValuesAccessor)fuelValues).getValues(); - *///?} + //?} } //? if >=1.21.2 { - /*public static FuelValues getFuelValues(){ + public static FuelValues getFuelValues(){ return FactoryAPI.currentServer == null ? FactoryAPIClient.hasLevel() ? FactoryAPIClient.getLevel().fuelValues() : null : FactoryAPI.currentServer.fuelValues(); } - *///?} + //?} public static int getBurnTime(ItemStack stack){ if (stack.isEmpty()) return 0; @@ -71,11 +68,11 @@ public static int getBurnTime(ItemStack stack){ /*return stack.getBurnTime(null/^? if >1.21.2 {^//^, getFuelValues()^//^?}^/); *///?} else { //? if <1.21.2 { - return Objects.requireNonNullElse(FuelRegistry.INSTANCE.get(stack.getItem()), 0); - //?} else { - /*FuelValues fuelValues = getFuelValues(); + /*return Objects.requireNonNullElse(FuelRegistry.INSTANCE.get(stack.getItem()), 0); + *///?} else { + FuelValues fuelValues = getFuelValues(); return fuelValues == null ? 0 : fuelValues.burnDuration(stack); - *///?} + //?} //?} } @@ -90,10 +87,10 @@ public static boolean isFuel(ItemStack stack){ public static void add(Item item, int burnTime){ //? if fabric { //? if <1.21.2 { - FuelRegistry.INSTANCE.add(item, burnTime); - //?} else { - /*FuelRegistryEvents.BUILD.register((call, c)->call.add(item, burnTime)); - *///?} + /*FuelRegistry.INSTANCE.add(item, burnTime); + *///?} else { + FuelValueEvents.BUILD.register((call, c)->call.add(item, burnTime)); + //?} //?} elif (forge && <1.21.6) || neoforge { /*FactoryAPIPlatform.getForgeEventBus().addListener(EventPriority.NORMAL,false, FurnaceFuelBurnTimeEvent.class, e-> { if (e.getItemStack().is(item)) e.setBurnTime(burnTime); diff --git a/src/main/java/wily/factoryapi/base/IFactoryItem.java b/src/main/java/wily/factoryapi/base/IFactoryItem.java index 4cf612b..3911ee6 100644 --- a/src/main/java/wily/factoryapi/base/IFactoryItem.java +++ b/src/main/java/wily/factoryapi/base/IFactoryItem.java @@ -1,9 +1,9 @@ package wily.factoryapi.base; //? if >=1.21.2 -//import net.minecraft.core.component.DataComponents; +import net.minecraft.core.component.DataComponents; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ItemStack; @@ -18,14 +18,14 @@ default ArbitrarySupplier getStorage(FactoryStor } //? if <1.21.2 { - default @Nullable String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot) { - ResourceLocation texture = getArmorLocation(stack,entity,slot); + /*default @Nullable String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot) { + Identifier texture = getArmorLocation(stack,entity,slot); return texture == null ? null : texture.toString(); } - //?} + *///?} - default @Nullable ResourceLocation getArmorLocation(ItemStack stack, /*? if <1.21.2 {*/Entity entity, /*?}*/ EquipmentSlot slot) { - return /*? if <1.21.2 {*/null /*?} else if <1.21.4 {*/ /*stack.get(DataComponents.EQUIPPABLE).model().orElse(null)*//*?} else {*//*stack.get(DataComponents.EQUIPPABLE).assetId().map(ResourceKey::/^? if <1.21.11 {^/location/^?} else {^//^identifier^//^?}^/).orElse(null)*//*?}*/; + default @Nullable Identifier getArmorLocation(ItemStack stack, /*? if <1.21.2 {*//*Entity entity, *//*?}*/ EquipmentSlot slot) { + return /*? if <1.21.2 {*//*null *//*?} else if <1.21.4 {*/ /*stack.get(DataComponents.EQUIPPABLE).model().orElse(null)*//*?} else {*/stack.get(DataComponents.EQUIPPABLE).assetId().map(ResourceKey::/*? if <1.21.11 {*//*location*//*?} else {*/identifier/*?}*/).orElse(null)/*?}*/; } default void clientExtension(Consumer clientExtensionConsumer){ diff --git a/src/main/java/wily/factoryapi/base/IPlatformFluidHandler.java b/src/main/java/wily/factoryapi/base/IPlatformFluidHandler.java index 64f40e2..1c2e8a5 100644 --- a/src/main/java/wily/factoryapi/base/IPlatformFluidHandler.java +++ b/src/main/java/wily/factoryapi/base/IPlatformFluidHandler.java @@ -133,8 +133,8 @@ default void deserializeTag(CompoundTag tag) { setFluid(FluidInstance.fromTag(tag)); Tag t = tag.tags.get("capacity"); if (t instanceof NumericTag) { - if (t instanceof LongTag l) setCapacity(FluidInstance.getMilliBucketsFluidAmount(l./*? if >1.21.4 {*//*value*//*?} else {*/getAsLong/*?}*/())); - else if (t instanceof IntTag i) setCapacity(i./*? if >1.21.4 {*//*value*//*?} else {*/getAsInt/*?}*/()); + if (t instanceof LongTag l) setCapacity(FluidInstance.getMilliBucketsFluidAmount(l./*? if >1.21.4 {*/value/*?} else {*//*getAsLong*//*?}*/())); + else if (t instanceof IntTag i) setCapacity(i./*? if >1.21.4 {*/value/*?} else {*//*getAsInt*//*?}*/()); } } diff --git a/src/main/java/wily/factoryapi/base/RegisterListing.java b/src/main/java/wily/factoryapi/base/RegisterListing.java index 81747f0..876c81a 100644 --- a/src/main/java/wily/factoryapi/base/RegisterListing.java +++ b/src/main/java/wily/factoryapi/base/RegisterListing.java @@ -1,7 +1,7 @@ package wily.factoryapi.base; import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import wily.factoryapi.FactoryAPI; import java.util.Collection; @@ -16,7 +16,7 @@ default Holder add(String name, Supplier supplier){ return add(name, id-> supplier.get()); } - Holder add(String name, Function supplier); + Holder add(String name, Function supplier); Stream> stream(); @@ -27,6 +27,6 @@ default Holder add(String name, Supplier supplier){ String getNamespace(); interface Holder extends Supplier { - ResourceLocation getId(); + Identifier getId(); } } diff --git a/src/main/java/wily/factoryapi/base/SimpleFluidLoggedBlock.java b/src/main/java/wily/factoryapi/base/SimpleFluidLoggedBlock.java index 253719a..0087f76 100644 --- a/src/main/java/wily/factoryapi/base/SimpleFluidLoggedBlock.java +++ b/src/main/java/wily/factoryapi/base/SimpleFluidLoggedBlock.java @@ -1,6 +1,6 @@ package wily.factoryapi.base; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/wily/factoryapi/base/SimpleItemCraftyStorage.java b/src/main/java/wily/factoryapi/base/SimpleItemCraftyStorage.java index d7528e9..b6bcb8f 100644 --- a/src/main/java/wily/factoryapi/base/SimpleItemCraftyStorage.java +++ b/src/main/java/wily/factoryapi/base/SimpleItemCraftyStorage.java @@ -6,7 +6,7 @@ import wily.factoryapi.init.FactoryRegistries; //? if <1.20.5 -import static net.minecraft.world.item.BlockItem.BLOCK_ENTITY_TAG; +//import static net.minecraft.world.item.BlockItem.BLOCK_ENTITY_TAG; public class SimpleItemCraftyStorage implements ICraftyEnergyStorage { private static final String KEY = "energy"; @@ -29,7 +29,7 @@ public SimpleItemCraftyStorage(ItemStack stack, int initialEnergy, int capacity, this.capacity = capacity; this.container = stack; //? if <1.20.5 { - CompoundTag tag = stack.getOrCreateTag(); + /*CompoundTag tag = stack.getOrCreateTag(); if (isBlockItem) tag = tag.getCompound(BLOCK_ENTITY_TAG); if (tag.getCompound("CYEnergy").isEmpty()){ CompoundTag storage = new CompoundTag(); @@ -39,7 +39,7 @@ public SimpleItemCraftyStorage(ItemStack stack, int initialEnergy, int capacity, tag.put("CYEnergy", storage); if (isBlockItem) stack.getOrCreateTag().put(BLOCK_ENTITY_TAG, tag); } - //?} + *///?} this.transportState = transportState; this.maxOutput = maxOutput; this.maxInput = maxInput; @@ -48,12 +48,12 @@ public SimpleItemCraftyStorage(ItemStack stack, int capacity, TransportState tra this(stack,0,capacity,capacity,capacity, transportState,supportableTier,stack.getItem() instanceof BlockItem); } //? if <1.20.5 { - private CompoundTag getEnergyCompound(){ + /*private CompoundTag getEnergyCompound(){ CompoundTag tag = container.getOrCreateTag(); if (isBlockItem) tag = tag.getCompound(BLOCK_ENTITY_TAG); return tag.getCompound("CYEnergy"); } - //?} + *///?} @Override public CraftyTransaction receiveEnergy(CraftyTransaction transaction, boolean simulate) { if (transaction.isEmpty()) return CraftyTransaction.EMPTY; @@ -88,45 +88,45 @@ public CraftyTransaction consumeEnergy(CraftyTransaction transaction, boolean si @Override public FactoryCapacityTier getSupportedTier() { - return /*? if <1.20.5 {*/ FactoryCapacityTier.values()[getEnergyCompound().getInt("tier")]/*?} else {*/ /*container.getOrDefault(FactoryRegistries.ENERGY_TIER_COMPONENT.get(), supportableTier)*//*?}*/; + return /*? if <1.20.5 {*/ /*FactoryCapacityTier.values()[getEnergyCompound().getInt("tier")]*//*?} else {*/ container.getOrDefault(FactoryRegistries.ENERGY_TIER_COMPONENT.get(), supportableTier)/*?}*/; } @Override public FactoryCapacityTier getStoredTier() { - return /*? if <1.20.5 {*/ FactoryCapacityTier.values()[getEnergyCompound().getInt("tier")]/*?} else {*/ /*container.getOrDefault(FactoryRegistries.STORED_ENERGY_TIER_COMPONENT.get(), FactoryCapacityTier.BASIC)*//*?}*/; + return /*? if <1.20.5 {*/ /*FactoryCapacityTier.values()[getEnergyCompound().getInt("tier")]*//*?} else {*/ container.getOrDefault(FactoryRegistries.STORED_ENERGY_TIER_COMPONENT.get(), FactoryCapacityTier.BASIC)/*?}*/; } @Override public int getEnergyStored() { - return /*? if <1.20.5 {*/ getEnergyCompound().getInt(KEY)/*?} else {*/ /*container.getOrDefault(FactoryRegistries.ENERGY_COMPONENT.get(), 0)*//*?}*/; + return /*? if <1.20.5 {*/ /*getEnergyCompound().getInt(KEY)*//*?} else {*/ container.getOrDefault(FactoryRegistries.ENERGY_COMPONENT.get(), 0)/*?}*/; } public void setEnergyStored(int energy) { //? if <1.20.5 { - CompoundTag tag = getEnergyCompound(); + /*CompoundTag tag = getEnergyCompound(); tag.putInt(KEY,energy); - //?} else { - /*container.set(FactoryRegistries.ENERGY_COMPONENT.get(),energy); - *///?} + *///?} else { + container.set(FactoryRegistries.ENERGY_COMPONENT.get(),energy); + //?} } public void setStoredTier(FactoryCapacityTier tier){ //? if <1.20.5 { - CompoundTag tag = getEnergyCompound(); + /*CompoundTag tag = getEnergyCompound(); tag.putInt("tier",tier.ordinal()); - //?} else { - /*container.set(FactoryRegistries.STORED_ENERGY_TIER_COMPONENT.get(),tier); - *///?} + *///?} else { + container.set(FactoryRegistries.STORED_ENERGY_TIER_COMPONENT.get(),tier); + //?} } @Override public void setSupportedTier(FactoryCapacityTier tier) { //? if <1.20.5 { - CompoundTag tag = getEnergyCompound(); + /*CompoundTag tag = getEnergyCompound(); tag.putInt("supportedTier",tier.ordinal()); - //?} else { - /*container.set(FactoryRegistries.ENERGY_TIER_COMPONENT.get(),tier); - *///?} + *///?} else { + container.set(FactoryRegistries.ENERGY_TIER_COMPONENT.get(),tier); + //?} } @Override @@ -137,13 +137,13 @@ public int getMaxEnergyStored() { @Override public CompoundTag serializeTag() { - return /*? if <1.20.5 {*/ getEnergyCompound()/*?} else {*/ /*new CompoundTag()*//*?}*/; + return /*? if <1.20.5 {*/ /*getEnergyCompound()*//*?} else {*/ new CompoundTag()/*?}*/; } @Override public void deserializeTag(CompoundTag nbt) { //? if <1.20.5 - this.container.setTag(nbt); + //this.container.setTag(nbt); } diff --git a/src/main/java/wily/factoryapi/base/StackIngredient.java b/src/main/java/wily/factoryapi/base/StackIngredient.java index 8e12f9d..7bc9a92 100644 --- a/src/main/java/wily/factoryapi/base/StackIngredient.java +++ b/src/main/java/wily/factoryapi/base/StackIngredient.java @@ -19,13 +19,13 @@ import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.TagParser; //? if >=1.20.5 { -/*import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.core.component.DataComponentMap; -import net.minecraft.core.component./^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/; +import net.minecraft.core.component./*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/; import net.minecraft.core.component.DataComponentType; -*///?} +//?} import net.minecraft.resources.HolderSetCodec; import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.Item; @@ -52,39 +52,39 @@ public class StackIngredient extends Ingredient implements FactoryIngredient { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( builder -> builder.group( HolderSetCodec.create(Registries.ITEM, BuiltInRegistries.ITEM.holderByNameCodec(),false).fieldOf("items").forGetter(StackIngredient::values), - /*? if >=1.20.5 {*//*/^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/*//*?} else {*/CompoundTag/*?}*/.CODEC.fieldOf(/*? if >=1.20.5 {*//*"components"*//*?} else {*/"nbt"/*?}*/).forGetter(StackIngredient::/*? if >=1.20.5 {*//*components*//*?} else {*/getTag/*?}*/), + /*? if >=1.20.5 {*//*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*//*?} else {*//*CompoundTag*//*?}*/.CODEC.fieldOf(/*? if >=1.20.5 {*/"components"/*?} else {*//*"nbt"*//*?}*/).forGetter(StackIngredient::/*? if >=1.20.5 {*/components/*?} else {*//*getTag*//*?}*/), Codec.BOOL.optionalFieldOf("strict", false).forGetter(StackIngredient::isStrict), Codec.INT.optionalFieldOf("count", 1).forGetter(StackIngredient::getCount)) .apply(builder, StackIngredient::new)); //? if >=1.20.5 { - /*public static final StreamCodec STREAM_CODEC = ByteBufCodecs.fromCodecWithRegistries(CODEC.codec()); - *///?} + public static final StreamCodec STREAM_CODEC = ByteBufCodecs.fromCodecWithRegistries(CODEC.codec()); + //?} public static final CommonNetwork.Identifier ID = CommonNetwork.Identifier.create(FactoryAPI.createModLocation("stack_ingredient"),StackIngredient::decode); private final HolderSet values; //? if >=1.20.5 { - /*private final /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/ components; - *///?} else { - private final CompoundTag tag; - //?} + private final /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/ components; + //?} else { + /*private final CompoundTag tag; + *///?} private final boolean strict; protected final ItemStack[] stacks; private final int count; - public StackIngredient(HolderSet values, /*? if >=1.20.5 {*/ /*/^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/ components*//*?} else {*/CompoundTag tag/*?}*/, boolean strict, int count) { - super(/*? if <1.21.2 {*/Stream.empty() /*?} else {*//*values*//*?}*/); + public StackIngredient(HolderSet values, /*? if >=1.20.5 {*/ /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/ components/*?} else {*//*CompoundTag tag*//*?}*/, boolean strict, int count) { + super(/*? if <1.21.2 {*//*Stream.empty() *//*?} else {*/values/*?}*/); this.values = values; //? if >=1.20.5 { - /*this.components = components; - *///?} else { - this.tag = tag; - //?} + this.components = components; + //?} else { + /*this.tag = tag; + *///?} this.strict = strict; this.stacks = values.stream().map(i ->{ ItemStack stack = new ItemStack(i, count); //? if >=1.20.5 { - /*stack.applyComponents(components.asPatch()); - *///?} else - stack.setTag(tag); + stack.applyComponents(components.asPatch()); + //?} else + //stack.setTag(tag); return stack; }).filter(i -> !i.isEmpty()).toArray(ItemStack[]::new); this.count = count; @@ -98,13 +98,13 @@ public boolean test(ItemStack stack) { } return false; } else { - return this.values.contains(stack.getItemHolder()) && /*? if >=1.20.5 {*/ /*this.components.test(stack) *//*?} else {*/ NbtUtils.compareNbt(tag, stack.getTag(), true) /*?}*/; + return this.values.contains(stack.typeHolder()) && /*? if >=1.20.5 {*/ this.components.test(stack) /*?} else {*/ /*NbtUtils.compareNbt(tag, stack.getTag(), true) *//*?}*/; } } //? if <1.21.2 { - @Override + /*@Override public boolean isEmpty() { return stacks.length == 0; } @@ -112,7 +112,7 @@ public boolean isEmpty() { public ItemStack[] getItems() { return stacks; } - //?} + *///?} public HolderSet values() { return values; @@ -123,14 +123,14 @@ public ItemStack[] getStacks() { } //? if >=1.20.5 { - /*public /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/ components() { + public /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/ components() { return components; } - *///?} else { - public CompoundTag getTag(){ + //?} else { + /*public CompoundTag getTag(){ return tag; } - //?} + *///?} public boolean isStrict() { return strict; @@ -147,70 +147,70 @@ public static StackIngredient of(boolean strict, ItemStack stack) { */ public static StackIngredient of(boolean strict, ItemStack stack, int count) { //? if >=1.20.5 { - /*return of(strict, stack.getComponents(), count, stack.getItem()); - *///?} else { - return new StackIngredient(HolderSet.direct(stack.getItemHolder()), stack.getTag(), strict, count); - //?} + return of(strict, stack.getComponents(), count, stack.getItem()); + //?} else { + /*return new StackIngredient(HolderSet.direct(stack.getItemHolder()), stack.getTag(), strict, count); + *///?} } //? if >=1.20.5 { - /*/^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ + */ public static StackIngredient of(boolean strict, DataComponentType type, T value, int count, ItemLike... items) { - return of(strict, /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/.builder().expect(type, value).build(), count, items); + return of(strict, /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/.builder().expect(type, value).build(), count, items); } - /^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ + */ public static StackIngredient of(boolean strict, Supplier> type, T value, int count, ItemLike... items) { return of(strict, type.get(), value, count, items); } - /^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ + */ public static StackIngredient of(boolean strict, DataComponentMap map, int count, ItemLike... items) { - return of(strict, /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/.allOf(map), count,items); + return of(strict, /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/.allOf(map), count,items); } - /^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ + */ @SafeVarargs public static StackIngredient of(boolean strict, DataComponentMap map, int count, Holder... items) { - return of(strict, /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/.allOf(map), count,items); + return of(strict, /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/.allOf(map), count,items); } - /^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ + */ public static StackIngredient of(boolean strict, DataComponentMap map, HolderSet items, int count) { - return of(strict, /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/.allOf(map), items, count); + return of(strict, /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/.allOf(map), items, count); } - /^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ + */ @SafeVarargs - public static StackIngredient of(boolean strict, /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/ predicate, int count, Holder... items) { + public static StackIngredient of(boolean strict, /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/ predicate, int count, Holder... items) { return of(strict, predicate, HolderSet.direct(items), count); } - /^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ - public static StackIngredient of(boolean strict, /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/ predicate, int count, ItemLike... items) { + */ + public static StackIngredient of(boolean strict, /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/ predicate, int count, ItemLike... items) { return of(strict, predicate, HolderSet.direct(Arrays.stream(items).map(ItemLike::asItem).map(Item::builtInRegistryHolder).toList()), count); } - /^* + /** * Creates a new ingredient matching any item from the list, containing the given components - ^/ - public static StackIngredient of(boolean strict, /^? if >1.21.4 {^//^DataComponentExactPredicate^//^?} else {^/DataComponentPredicate/^?}^/ predicate, HolderSet items, int count) { + */ + public static StackIngredient of(boolean strict, /*? if >1.21.4 {*/DataComponentExactPredicate/*?} else {*//*DataComponentPredicate*//*?}*/ predicate, HolderSet items, int count) { return new StackIngredient(items, predicate, strict,count); } - *///?} + //?} @Override public int getCount() { @@ -225,17 +225,17 @@ public CommonNetwork.Identifier identifier() { @Override public void encode(CommonNetwork.PlayBuf buf) { //? if <1.20.5 { - buf.get().writeCollection(values.stream().toList(),(b,i)->b.writeId(BuiltInRegistries.ITEM,i.value())); + /*buf.get().writeCollection(values.stream().toList(),(b,i)->b.writeId(BuiltInRegistries.ITEM,i.value())); buf.get().writeNbt(tag); buf.get().writeBoolean(isStrict()); buf.get().writeByte(getCount()); - //?} else - //STREAM_CODEC.encode(buf.get(),this); + *///?} else + STREAM_CODEC.encode(buf.get(),this); } public static StackIngredient decode(CommonNetwork.PlayBuf buf){ //? if <1.20.5 { - return new StackIngredient(HolderSet.direct((List>) buf.get().readCollection(ArrayList::new,(b)->b.readById(BuiltInRegistries.ITEM.asHolderIdMap()))), buf.get().readNbt(), buf.get().readBoolean(), buf.get().readByte()); - //?} else - //return STREAM_CODEC.decode(buf.get()); + /*return new StackIngredient(HolderSet.direct((List>) buf.get().readCollection(ArrayList::new,(b)->b.readById(BuiltInRegistries.ITEM.asHolderIdMap()))), buf.get().readNbt(), buf.get().readBoolean(), buf.get().readByte()); + *///?} else + return STREAM_CODEC.decode(buf.get()); } } diff --git a/src/main/java/wily/factoryapi/base/client/AdvancedTextWidget.java b/src/main/java/wily/factoryapi/base/client/AdvancedTextWidget.java index 14eb56d..5702298 100644 --- a/src/main/java/wily/factoryapi/base/client/AdvancedTextWidget.java +++ b/src/main/java/wily/factoryapi/base/client/AdvancedTextWidget.java @@ -2,10 +2,10 @@ import net.minecraft.client.Minecraft; //? if >=1.21.11 { -/*import net.minecraft.client.gui.ActiveTextCollector; +import net.minecraft.client.gui.ActiveTextCollector; import net.minecraft.network.chat.Style; import wily.factoryapi.mixin.base.ScreenAccessor; -*///?} +//?} import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.font.glyphs.BakedGlyph; @@ -13,9 +13,9 @@ import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.navigation.ScreenRectangle; //? if >=1.21.9 { -/*import net.minecraft.client.input.MouseButtonEvent; +import net.minecraft.client.input.MouseButtonEvent; import wily.factoryapi.mixin.base.BakedSheetGlyphAccessor; -*///?} +//?} import net.minecraft.network.chat.Component; import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.Mth; @@ -70,18 +70,18 @@ public static int getLineHeight(FormattedCharSequence sequence){ sequence.accept((n, style, pos)->{ FontAccessor fontAccessor = (FontAccessor) Minecraft.getInstance().font; //? if >=1.21.9 { - /*BakedGlyph glyph = fontAccessor.getBakedGlyph(pos, style); + BakedGlyph glyph = fontAccessor.getBakedGlyph(pos, style); if (glyph instanceof BakedSheetGlyphAccessor sheetGlyph) { int height = Math.round(sheetGlyph.getBottom() - sheetGlyph.getTop()); if (height > bearer.get()) bearer.set(height); } else if (glyph.info().getAdvance() > bearer.get()) bearer.set(Math.round(glyph.info().getAdvance())); - *///?} else { - fontAccessor.getDefaultFontSet(style.getFont()).getGlyphInfo(pos, fontAccessor.getFilterFishyGlyphs()).bake(sheetGlyphInfo-> { + //?} else { + /*fontAccessor.getDefaultFontSet(style.getFont()).getGlyphInfo(pos, fontAccessor.getFilterFishyGlyphs()).bake(sheetGlyphInfo-> { int height = Math.round(sheetGlyphInfo.getPixelHeight() / sheetGlyphInfo.getOversample()); if (height > bearer.get()) bearer.set(height); return null; }); - //?} + *///?} return true; }); return bearer.get(); @@ -138,20 +138,20 @@ public void render(GuiGraphics guiGraphics, int i, int j, float f) { } //? if >=1.21.9 { - /*@Override + @Override public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) { if (handleComponentsClicked(mouseButtonEvent.x(), mouseButtonEvent.y(), mouseButtonEvent.button())) return true; return GuiEventListener.super.mouseClicked(mouseButtonEvent, bl); } - *///?} else { - @Override + //?} else { + /*@Override public boolean mouseClicked(double d, double e, int i) { if (handleComponentsClicked(d, e, i)) return true; return GuiEventListener.super.mouseClicked(d, e, i); } - //?} + *///?} public boolean handleComponentsClicked(double d, double e, int i) { if (accessor.getScreen() != null && isMouseOver(d,e)){ @@ -161,13 +161,13 @@ public boolean handleComponentsClicked(double d, double e, int i) { int lineHeight = heightPerLine[i1]; if (e >= actualHeight && e < actualHeight + lineHeight){ //? if >=1.21.11 { - /*ActiveTextCollector.ClickableStyleFinder clickableStyleFinder = new ActiveTextCollector.ClickableStyleFinder(Minecraft.getInstance().font, (int) d, (int) e); + ActiveTextCollector.ClickableStyleFinder clickableStyleFinder = new ActiveTextCollector.ClickableStyleFinder(Minecraft.getInstance().font, (int) d, (int) e); clickableStyleFinder.accept(0, Mth.floor(d - getX()), lines.get(i1)); // TODO WHAT WHAT WHAT WHAT WHAT Style style = clickableStyleFinder.result(); if (style != null) ScreenAccessor.callDefaultHandleGameClickEvent(style.getClickEvent(), Minecraft.getInstance(), accessor.getScreen()); - *///?} else { - accessor.getScreen().handleComponentClicked(Minecraft.getInstance().font.getSplitter().componentStyleAtWidth(lines.get(i1), Mth.floor(d - getX()))); - //?} + //?} else { + /*accessor.getScreen().handleComponentClicked(Minecraft.getInstance().font.getSplitter().componentStyleAtWidth(lines.get(i1), Mth.floor(d - getX()))); + *///?} return true; } actualHeight += lineHeight; diff --git a/src/main/java/wily/factoryapi/base/client/FactoryConfigWidgets.java b/src/main/java/wily/factoryapi/base/client/FactoryConfigWidgets.java index d104642..ee46859 100644 --- a/src/main/java/wily/factoryapi/base/client/FactoryConfigWidgets.java +++ b/src/main/java/wily/factoryapi/base/client/FactoryConfigWidgets.java @@ -6,7 +6,7 @@ import com.google.gson.JsonSyntaxException; import com.mojang.serialization.DataResult; import com.mojang.serialization.JsonOps; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.components.*; @@ -47,9 +47,9 @@ public static AbstractWidget createWidget(FactoryConfig config, int x, in AbstractWidget override = getOverride(config, tooltipFunction, x, y, width, afterSet); if (override != null) return override; if (config.control().equals(FactoryConfigControl.TOGGLE)) { - return CycleButton.builder(b -> display.valueToComponent().apply((T) b)/*? if >=1.21.11 {*//*, () -> (Boolean) config.get()*//*?}*/).withValues(OptionInstance.BOOLEAN_VALUES.valueListSupplier()).withTooltip(((Function) tooltipFunction)::apply)/*? if <1.21.11 {*/.withInitialValue((Boolean) config.get())/*?}*/.create(x, y, width, 20, display.name(), (cycleButton, object) -> FactoryConfig.saveOptionAndConsume(config, (T)object, afterSet)); + return CycleButton.builder(b -> display.valueToComponent().apply((T) b)/*? if >=1.21.11 {*/, () -> (Boolean) config.get()/*?}*/).withValues(OptionInstance.BOOLEAN_VALUES.valueListSupplier()).withTooltip(((Function) tooltipFunction)::apply)/*? if <1.21.11 {*//*.withInitialValue((Boolean) config.get())*//*?}*/.create(x, y, width, 20, display.name(), (cycleButton, object) -> FactoryConfig.saveOptionAndConsume(config, (T)object, afterSet)); } else if (config.control() instanceof FactoryConfigControl.FromInt c) { - return CycleButton.builder(display.valueToComponent()/*? if >=1.21.11 {*//*, config*//*?}*/).withValues(listSupplier(c.valueGetter(), c.valuesSize())).withTooltip(tooltipFunction::apply)/*? if <1.21.11 {*/.withInitialValue(config.get())/*?}*/.create(x, y, width, 20, display.name(), (cycleButton, object) -> FactoryConfig.saveOptionAndConsume(config, object,afterSet)); + return CycleButton.builder(display.valueToComponent()/*? if >=1.21.11 {*/, config/*?}*/).withValues(listSupplier(c.valueGetter(), c.valuesSize())).withTooltip(tooltipFunction::apply)/*? if <1.21.11 {*//*.withInitialValue(config.get())*//*?}*/.create(x, y, width, 20, display.name(), (cycleButton, object) -> FactoryConfig.saveOptionAndConsume(config, object,afterSet)); } else if (config.control() instanceof FactoryConfigControl.FromDouble c) { return createSlider(config, x, y, width, afterSet, c.valueGetter(), c.valueSetter(), tooltipFunction); } else if (config.control() instanceof FactoryConfigControl.Int c) { diff --git a/src/main/java/wily/factoryapi/base/client/FactoryGuiGraphics.java b/src/main/java/wily/factoryapi/base/client/FactoryGuiGraphics.java index 867750d..ef5ef37 100644 --- a/src/main/java/wily/factoryapi/base/client/FactoryGuiGraphics.java +++ b/src/main/java/wily/factoryapi/base/client/FactoryGuiGraphics.java @@ -5,20 +5,20 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; //? if >1.20.1 && <1.21.9 { -import net.minecraft.client.gui.GuiSpriteManager; -//?} -//? if >=1.21.9 { -/*import net.minecraft.data.AtlasIds; +/*import net.minecraft.client.gui.GuiSpriteManager; *///?} +//? if >=1.21.9 { +import net.minecraft.data.AtlasIds; +//?} //? if >=1.21.6 { -/*import com.mojang.blaze3d.pipeline.RenderPipeline; -*///?} +import com.mojang.blaze3d.pipeline.RenderPipeline; +//?} import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.joml.Matrix4f; import wily.factoryapi.FactoryAPIClient; @@ -38,32 +38,32 @@ static FactoryGuiGraphics of(GuiGraphics guiGraphics) { } //? if >=1.21.9 { - /*static TextureAtlas getSprites() { + static TextureAtlas getSprites() { return Minecraft.getInstance().getAtlasManager().getAtlasOrThrow(AtlasIds.GUI); } - *///?} else { - static GuiSpriteManager getSprites() { - return /*? if >1.20.1 {*/ Minecraft.getInstance().getGuiSprites()/*?} else {*//*FactoryAPIClient.sprites*//*?}*/; + //?} else { + /*static GuiSpriteManager getSprites() { + return /^? if >1.20.1 {^/ Minecraft.getInstance().getGuiSprites()/^?} else {^//^FactoryAPIClient.sprites^//^?}^/; } - //?} + *///?} - void blit(ResourceLocation texture, int x, int y, int uvX, int uvY, int width, int height); + void blit(Identifier texture, int x, int y, int uvX, int uvY, int width, int height); - void blit(ResourceLocation texture, int x, int y, int z, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight); + void blit(Identifier texture, int x, int y, int z, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight); - void blit(ResourceLocation texture, int x, int xd, int y, int yd, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight); + void blit(Identifier texture, int x, int xd, int y, int yd, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight); - void blit(ResourceLocation texture, int x, int y, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight); + void blit(Identifier texture, int x, int y, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight); - void blitSprite(ResourceLocation resourceLocation, int x, int y, int width, int height); + void blitSprite(Identifier resourceLocation, int x, int y, int width, int height); - void blitSprite(ResourceLocation resourceLocation, int x, int y, int z, int width, int height); + void blitSprite(Identifier resourceLocation, int x, int y, int z, int width, int height); - void blitSprite(ResourceLocation resourceLocation, int textureWidth, int textureHeight, int uvX, int uvY, int x, int y, int z, int width, int height); + void blitSprite(Identifier resourceLocation, int textureWidth, int textureHeight, int uvX, int uvY, int x, int y, int z, int width, int height); void blit(int x, int y, int z, int width, int height, TextureAtlasSprite textureAtlasSprite); - default void blitSprite(ResourceLocation resourceLocation, int textureWidth, int textureHeight, int uvX, int uvY, int x, int y, int width, int height) { + default void blitSprite(Identifier resourceLocation, int textureWidth, int textureHeight, int uvX, int uvY, int x, int y, int width, int height) { this.blitSprite(resourceLocation, textureWidth, textureHeight, uvX, uvY, x, y,0, width, height); } @@ -109,7 +109,7 @@ default void enableScissor(int x, int y, int xd, int yd) { *///?} //? if <1.21.2 { - default void blitTiledSprite(TextureAtlasSprite textureAtlasSprite, int i, int j, int k, int l, int m, int n, int o, int p, int q, int r, int s) { + /*default void blitTiledSprite(TextureAtlasSprite textureAtlasSprite, int i, int j, int k, int l, int m, int n, int o, int p, int q, int r, int s) { if (l <= 0 || m <= 0 ) { return; } @@ -121,11 +121,11 @@ default void blitTiledSprite(TextureAtlasSprite textureAtlasSprite, int i, int j Matrix4f matrix4f = context().pose().last().pose(); //? if >=1.20.5 { - /*BufferBuilder bufferBuilder = Tesselator.getInstance().begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); - *///?} else { - BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); + BufferBuilder bufferBuilder = Tesselator.getInstance().begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); + //?} else { + /^BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); - //?} + ^///?} for(int t = 0; t < l; t += p) { int u = Math.min(p, l - t); @@ -135,14 +135,14 @@ default void blitTiledSprite(TextureAtlasSprite textureAtlasSprite, int i, int j addBlitSpriteQuad(textureAtlasSprite, bufferBuilder, matrix4f, r, s, n, o, i + t, j + v, k, u, w); } } - BufferUploader.drawWithShader(bufferBuilder./*? if <1.20.5 {*/end/*?} else {*//*buildOrThrow*//*?}*/()); + BufferUploader.drawWithShader(bufferBuilder./^? if <1.20.5 {^//^end^//^?} else {^/buildOrThrow/^?}^/()); } //? if <=1.20.1 { - /*private void addBlitSpriteQuad(TextureAtlasSprite textureAtlasSprite, BufferBuilder bufferBuilder, Matrix4f matrix4f, int i, int j, int k, int l, int m, int n, int o, int p, int q) { + /^private void addBlitSpriteQuad(TextureAtlasSprite textureAtlasSprite, BufferBuilder bufferBuilder, Matrix4f matrix4f, int i, int j, int k, int l, int m, int n, int o, int p, int q) { addBlitQuad(bufferBuilder, matrix4f, m, m + p, n, n + q, o, textureAtlasSprite.getU((float)k / (float)i * 16), textureAtlasSprite.getU((float)(k + p) / (float)i * 16), textureAtlasSprite.getV((float)l / (float)j * 16), textureAtlasSprite.getV((float)(l + q) / (float)j * 16)); } - *///?} else { + ^///?} else { private void addBlitSpriteQuad(TextureAtlasSprite textureAtlasSprite, BufferBuilder bufferBuilder, Matrix4f matrix4f, int i, int j, int k, int l, int m, int n, int o, int p, int q) { addBlitQuad(bufferBuilder, matrix4f, m, m + p, n, n + q, o, textureAtlasSprite.getU((float)k / (float)i), textureAtlasSprite.getU((float)(k + p) / (float)i), textureAtlasSprite.getV((float)l / (float)j), textureAtlasSprite.getV((float)(l + q) / (float)j)); } @@ -150,22 +150,22 @@ private void addBlitSpriteQuad(TextureAtlasSprite textureAtlasSprite, BufferBuil private void addBlitQuad(BufferBuilder bufferBuilder, Matrix4f matrix4f, int i, int j, int k, int l, int m, float f, float g, float h, float n) { //? if <1.20.5 { - bufferBuilder.vertex(matrix4f, (float)i, (float)k, (float)m).uv(f, h).endVertex(); + /^bufferBuilder.vertex(matrix4f, (float)i, (float)k, (float)m).uv(f, h).endVertex(); bufferBuilder.vertex(matrix4f, (float)i, (float)l, (float)m).uv(f, n).endVertex(); bufferBuilder.vertex(matrix4f, (float)j, (float)l, (float)m).uv(g, n).endVertex(); bufferBuilder.vertex(matrix4f, (float)j, (float)k, (float)m).uv(g, h).endVertex(); - //?} else { - /*bufferBuilder.addVertex(matrix4f, (float)i, (float)k, (float)m).setUv(f, h); + ^///?} else { + bufferBuilder.addVertex(matrix4f, (float)i, (float)k, (float)m).setUv(f, h); bufferBuilder.addVertex(matrix4f, (float)i, (float)l, (float)m).setUv(f, n); bufferBuilder.addVertex(matrix4f, (float)j, (float)l, (float)m).setUv(g, n); bufferBuilder.addVertex(matrix4f, (float)j, (float)k, (float)m).setUv(g, h); - *///?} + //?} } - //?} + *///?} //? if <1.21.6 { - void setColor(int color, boolean changeBlend); + /*void setColor(int color, boolean changeBlend); void setColor(float r, float g, float b, float a, boolean changeBlend); @@ -188,10 +188,10 @@ default void clearColor() { clearColor(false); } - //?} + *///?} //? if >=1.21.2 { - /*void setBlitColor(int color); + void setBlitColor(int color); void setBlitColor(float r, float g, float b, float a); @@ -200,7 +200,7 @@ default void clearColor() { default void clearBlitColor() { setBlitColor(1.0f,1.0f,1.0f,1.0f); } - *///?} + //?} @Deprecated void disableDepthTest(); @@ -212,7 +212,7 @@ interface AtlasAccessor { static AtlasAccessor of(TextureAtlas atlas) { return (AtlasAccessor) atlas; } - Map getTexturesByName(); + Map getTexturesByName(); } interface Accessor { diff --git a/src/main/java/wily/factoryapi/base/client/FactoryRenderStateExtension.java b/src/main/java/wily/factoryapi/base/client/FactoryRenderStateExtension.java index f1606c3..cfab4f4 100644 --- a/src/main/java/wily/factoryapi/base/client/FactoryRenderStateExtension.java +++ b/src/main/java/wily/factoryapi/base/client/FactoryRenderStateExtension.java @@ -1,5 +1,5 @@ //? if >=1.21.2 { -/*package wily.factoryapi.base.client; +package wily.factoryapi.base.client; import net.minecraft.client.renderer.entity.state.EntityRenderState; import net.minecraft.world.entity.Entity; @@ -31,4 +31,4 @@ static Accessor of(EntityRenderState entityRenderState){ > T getExtension(Class extensionClass); } } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/base/client/FactoryScreenWindow.java b/src/main/java/wily/factoryapi/base/client/FactoryScreenWindow.java index 2c79ebc..68843d0 100644 --- a/src/main/java/wily/factoryapi/base/client/FactoryScreenWindow.java +++ b/src/main/java/wily/factoryapi/base/client/FactoryScreenWindow.java @@ -8,13 +8,13 @@ import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; //? if >=1.21.9 { -/*import net.minecraft.client.input.KeyEvent; +import net.minecraft.client.input.KeyEvent; import net.minecraft.client.input.MouseButtonEvent; -*///?} +//?} import net.minecraft.client.renderer.Rect2i; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import wily.factoryapi.base.client.drawable.AbstractDrawableButton; import wily.factoryapi.base.client.drawable.DrawableStatic; import wily.factoryapi.util.FactoryScreenUtil; @@ -32,7 +32,7 @@ public abstract class FactoryScreenWindow> public boolean dragging = false; - public ResourceLocation backgroundSprite; + public Identifier backgroundSprite; protected final ItemRenderer itemRenderer; protected final Font font = Minecraft.getInstance().font; @@ -79,7 +79,7 @@ public void onClickOutside(double mouseX, double mouseY) { } //? if >=1.21.9 { - /*@Override + @Override public boolean keyPressed(KeyEvent keyEvent) { if (keyEvent.isEscape() && isVisible()) { onClose(); @@ -88,8 +88,8 @@ public boolean keyPressed(KeyEvent keyEvent) { return false; } - *///?} else { - @Override + //?} else { + /*@Override public boolean keyPressed(int i, int j, int k) { if (i == 256 && isVisible()) { onClose(); @@ -98,19 +98,19 @@ public boolean keyPressed(int i, int j, int k) { return false; } - //?} + *///?} protected void renderBg(GuiGraphics graphics, int i, int j, float f) { FactoryGuiMatrixStack.of(graphics.pose()).pushPose(); FactoryScreenUtil.enableBlend(); FactoryScreenUtil.enableDepthTest(); //? if <1.21.6 - RenderSystem.setShaderColor(1,1,1,alpha); + //RenderSystem.setShaderColor(1,1,1,alpha); if (backgroundSprite != null) FactoryGuiGraphics.of(graphics).blitSprite(backgroundSprite, getX(), getY(), width, height); else drawable.draw(graphics,getX(),getY()); IWindowWidget.super.render(graphics,i,j,f); //? if <1.21.6 - RenderSystem.setShaderColor(1,1,1,1); + //RenderSystem.setShaderColor(1,1,1,1); FactoryScreenUtil.disableBlend(); FactoryScreenUtil.disableDepthTest(); FactoryGuiMatrixStack.of(graphics.pose()).popPose(); @@ -161,7 +161,7 @@ public void updateLastMouse(int mouseX, int mouseY){ } //? if >=1.21.9 { - /*@Override + @Override public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) { return handleClick(mouseButtonEvent.x(), mouseButtonEvent.y(), mouseButtonEvent.button()) || IWindowWidget.super.mouseClicked(mouseButtonEvent, bl); } @@ -178,8 +178,8 @@ public boolean mouseDragged(MouseButtonEvent mouseButtonEvent, double d, double return handleDragging(mouseButtonEvent.x(), mouseButtonEvent.y(), mouseButtonEvent.button(), d, e) ; } - *///?} else { - @Override + //?} else { + /*@Override public boolean mouseClicked(double d, double e, int i) { return handleClick(d, e, i) || IWindowWidget.super.mouseClicked(d, e, i); } @@ -195,7 +195,7 @@ public boolean mouseDragged(double x, double y, int i, double dx, double dy) { if (IWindowWidget.super.mouseDragged(x, y, i, dx, dy)) return true; return handleDragging(x, y, i, dx, dy); } - //?} + *///?} public boolean handleClick(double d, double e, int i) { if (!isVisible()) return false; diff --git a/src/main/java/wily/factoryapi/base/client/GuiMetadataSection.java b/src/main/java/wily/factoryapi/base/client/GuiMetadataSection.java index b6dcad9..f4e7e02 100644 --- a/src/main/java/wily/factoryapi/base/client/GuiMetadataSection.java +++ b/src/main/java/wily/factoryapi/base/client/GuiMetadataSection.java @@ -4,7 +4,7 @@ import com.google.gson.JsonObject; import com.mojang.serialization.*; import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.server.packs.metadata.MetadataSectionType; import net.minecraft.util.ExtraCodecs; diff --git a/src/main/java/wily/factoryapi/base/client/GuiSpriteManager.java b/src/main/java/wily/factoryapi/base/client/GuiSpriteManager.java index ed166c5..f03821b 100644 --- a/src/main/java/wily/factoryapi/base/client/GuiSpriteManager.java +++ b/src/main/java/wily/factoryapi/base/client/GuiSpriteManager.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.TextureAtlasHolder; import net.minecraft.client.resources.metadata.animation.AnimationMetadataSection; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.metadata.MetadataSectionSerializer; import java.util.Set; @@ -15,11 +15,11 @@ public class GuiSpriteManager extends TextureAtlasHolder { public static final Set> DEFAULT_METADATA_SECTIONS = Set.of(AnimationMetadataSection.SERIALIZER); public GuiSpriteManager(TextureManager arg) { - super(arg, new ResourceLocation("textures/atlas/gui.png"), new ResourceLocation("gui")); + super(arg, new Identifier("textures/atlas/gui.png"), new Identifier("gui")); } @Override - public TextureAtlasSprite getSprite(ResourceLocation resourceLocation) { + public TextureAtlasSprite getSprite(Identifier resourceLocation) { return super.getSprite(resourceLocation); } diff --git a/src/main/java/wily/factoryapi/base/client/IFactoryBlockEntityWLRenderer.java b/src/main/java/wily/factoryapi/base/client/IFactoryBlockEntityWLRenderer.java index b17f9b4..d4dd2c2 100644 --- a/src/main/java/wily/factoryapi/base/client/IFactoryBlockEntityWLRenderer.java +++ b/src/main/java/wily/factoryapi/base/client/IFactoryBlockEntityWLRenderer.java @@ -5,23 +5,23 @@ import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.MultiBufferSource; //? if >=1.21.4 { -/*import net.minecraft.client.renderer.special.SpecialModelRenderer; -*///?} +import net.minecraft.client.renderer.special.SpecialModelRenderer; +//?} import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import org.jetbrains.annotations.Nullable; -public interface IFactoryBlockEntityWLRenderer /*? if >=1.21.4 {*//*extends SpecialModelRenderer*//*?}*/ { +public interface IFactoryBlockEntityWLRenderer /*? if >=1.21.4 {*/extends SpecialModelRenderer/*?}*/ { //? if <1.21.9 { - void renderByItemBlockState(BlockState state, ItemStack itemStack, ItemDisplayContext displayContext, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j); + /*void renderByItemBlockState(BlockState state, ItemStack itemStack, ItemDisplayContext displayContext, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j); default void renderByItem(ItemStack itemStack, ItemDisplayContext displayContext, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j) { renderByItemBlockState(((BlockItem)(itemStack.getItem())).getBlock().defaultBlockState(), itemStack, displayContext, poseStack, multiBufferSource, i, j); } - //?} + *///?} //? if >=1.21.4 { - /*@Override + @Override default ItemStack extractArgument(ItemStack itemStack) { return itemStack; } @@ -30,16 +30,16 @@ default MapCodec createUnbakedCodec(){ return MapCodec.unit(new SpecialModelRenderer.Unbaked(){ //? if >=1.21.9 { - /^@Override + @Override public @Nullable SpecialModelRenderer bake(BakingContext bakingContext) { return IFactoryBlockEntityWLRenderer.this; } - ^///?} else { - @Override + //?} else { + /*@Override public @Nullable SpecialModelRenderer bake(EntityModelSet entityModelSet) { return IFactoryBlockEntityWLRenderer.this; } - //?} + *///?} @Override public MapCodec type() { @@ -49,10 +49,10 @@ public MapCodec type() { } //? if <1.21.9 { - @Override + /*@Override default void render(@Nullable ItemStack object, ItemDisplayContext itemDisplayContext, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j, boolean bl) { renderByItem(object,itemDisplayContext,poseStack,multiBufferSource,i,j); } - //?} *///?} + //?} } diff --git a/src/main/java/wily/factoryapi/base/client/IFactoryItemClientExtension.java b/src/main/java/wily/factoryapi/base/client/IFactoryItemClientExtension.java index d30fec2..44db06f 100644 --- a/src/main/java/wily/factoryapi/base/client/IFactoryItemClientExtension.java +++ b/src/main/java/wily/factoryapi/base/client/IFactoryItemClientExtension.java @@ -5,13 +5,13 @@ import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; //? if >1.21.2 { -/*import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; +import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; //? if <1.21.4 { -import net.minecraft.world.item.equipment.EquipmentModel; -//?} else { -/^import net.minecraft.client.resources.model.EquipmentClientInfo; -^///?} -*///?} +/*import net.minecraft.world.item.equipment.EquipmentModel; +*///?} else { +import net.minecraft.client.resources.model.EquipmentClientInfo; +//?} +//?} import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.Item; @@ -31,7 +31,7 @@ public interface IFactoryItemClientExtension { default IFactoryBlockEntityWLRenderer getCustomRenderer() { return null; } - default T getHumanoidArmorModel(/*? if >=1.21.2 && !neoforge {*//*LivingEntityRenderState livingEntityRenderState,*//*?} else if <1.21.2 {*/LivingEntity livingEntity,/*?}*/ ItemStack itemStack, EquipmentSlot equipmentSlot, T original){ + default T getHumanoidArmorModel(/*? if >=1.21.2 && !neoforge {*/LivingEntityRenderState livingEntityRenderState,/*?} else if <1.21.2 {*//*LivingEntity livingEntity,*//*?}*/ ItemStack itemStack, EquipmentSlot equipmentSlot, T original){ return original; } //? if >=1.21.2 && neoforge { diff --git a/src/main/java/wily/factoryapi/base/client/IWindowWidget.java b/src/main/java/wily/factoryapi/base/client/IWindowWidget.java index fb89ee3..0b740ae 100644 --- a/src/main/java/wily/factoryapi/base/client/IWindowWidget.java +++ b/src/main/java/wily/factoryapi/base/client/IWindowWidget.java @@ -6,8 +6,8 @@ import net.minecraft.client.gui.layouts.LayoutElement; import net.minecraft.client.gui.navigation.ScreenRectangle; //? if >=1.21.9 { -/*import net.minecraft.client.input.MouseButtonEvent; -*///?} +import net.minecraft.client.input.MouseButtonEvent; +//?} import net.minecraft.client.renderer.Rect2i; import wily.factoryapi.base.ArbitrarySupplier; import wily.factoryapi.base.client.drawable.DrawableStatic; @@ -18,7 +18,7 @@ public interface IWindowWidget extends GuiEventListener, Renderable { //? if >=1.21.9 { - /*@Override + @Override default boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) { for (Renderable nestedRenderable : getNestedRenderables()) if (nestedRenderable instanceof GuiEventListener listener && listener.mouseClicked(mouseButtonEvent, bl)) return true; @@ -36,8 +36,8 @@ default boolean mouseDragged(MouseButtonEvent mouseButtonEvent, double f, double if (nestedRenderable instanceof GuiEventListener listener && listener.mouseDragged(mouseButtonEvent, f, g)) return true; return false; } - *///?} else { - @Override + //?} else { + /*@Override default boolean mouseClicked(double d, double e, int i) { for (Renderable nestedRenderable : getNestedRenderables()) if (nestedRenderable instanceof GuiEventListener listener && listener.mouseClicked(d,e,i)) return true; @@ -55,7 +55,7 @@ default boolean mouseDragged(double d, double e, int i, double f, double g) { if (nestedRenderable instanceof GuiEventListener listener && listener.mouseDragged(d,e,i,f,g)) return true; return false; } - //?} + *///?} default void render(GuiGraphics guiGraphics, int i, int j, float f) { for (Renderable nestedRenderable : getNestedRenderables()) { diff --git a/src/main/java/wily/factoryapi/base/client/MinecraftAccessor.java b/src/main/java/wily/factoryapi/base/client/MinecraftAccessor.java index 7da2740..b918233 100644 --- a/src/main/java/wily/factoryapi/base/client/MinecraftAccessor.java +++ b/src/main/java/wily/factoryapi/base/client/MinecraftAccessor.java @@ -8,8 +8,8 @@ static MinecraftAccessor getInstance(){ return (MinecraftAccessor) Minecraft.getInstance(); } //? if <1.20.5 { - float getPausePartialTick(); - //?} + /*float getPausePartialTick(); + *///?} boolean setUser(User user); boolean hasGameLoaded(); diff --git a/src/main/java/wily/factoryapi/base/client/MipmapMetadataSection.java b/src/main/java/wily/factoryapi/base/client/MipmapMetadataSection.java index 5ac5a4b..c6f3e8a 100644 --- a/src/main/java/wily/factoryapi/base/client/MipmapMetadataSection.java +++ b/src/main/java/wily/factoryapi/base/client/MipmapMetadataSection.java @@ -4,7 +4,7 @@ import com.mojang.serialization.Codec; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.SpriteContents; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.metadata.MetadataSectionType; import net.minecraft.server.packs.resources.Resource; import org.apache.commons.io.FilenameUtils; @@ -20,7 +20,7 @@ public record MipmapMetadataSection(Map levels) { public static final MipmapMetadataSection EMPTY = new MipmapMetadataSection(Collections.emptyMap()); public static final Codec CODEC = Codec.unboundedMap(Codec.STRING.xmap(Integer::parseInt, Object::toString), Level.CODEC).xmap(MipmapMetadataSection::new, MipmapMetadataSection::levels); - public static final MetadataSectionType TYPE = /*? if >1.21.3 {*//*new MetadataSectionType<>("mipmap", CODEC)*//*?} else if >1.20.1 {*/ MetadataSectionType.fromCodec("mipmap", CODEC)/*?} else {*//*GuiMetadataSection.fromCodec("mipmap", CODEC)*//*?}*/; + public static final MetadataSectionType TYPE = /*? if >1.21.3 {*/new MetadataSectionType<>("mipmap", CODEC)/*?} else if >1.20.1 {*/ /*MetadataSectionType.fromCodec("mipmap", CODEC)*//*?} else {*//*GuiMetadataSection.fromCodec("mipmap", CODEC)*//*?}*/; public static final Pattern MANUAL_MIPMAP_PATTERN = Pattern.compile(".+/(\\d).png"); public static MipmapMetadataSection createFallback(SpriteContents contents, int maxLevel){ @@ -28,7 +28,7 @@ public static MipmapMetadataSection createFallback(SpriteContents contents, int if (!baseName.isEmpty()) { MipmapMetadataSection section = new MipmapMetadataSection(new HashMap<>()); for (int i = 1; i <= maxLevel; i++) { - ResourceLocation resourceLocation = contents.name().withPath("%s/%s/%s.png".formatted(FactoryOptions.MANUAL_MIPMAP_PATH.get(), baseName, i)); + Identifier resourceLocation = contents.name().withPath("%s/%s/%s.png".formatted(FactoryOptions.MANUAL_MIPMAP_PATH.get(), baseName, i)); Minecraft.getInstance().getResourceManager().getResource(resourceLocation).ifPresent(resource -> { Matcher matcher = MANUAL_MIPMAP_PATTERN.matcher(resourceLocation.getPath()); while (matcher.find()) { @@ -49,12 +49,12 @@ public static MipmapMetadataSection createFallback(SpriteContents contents, int return EMPTY; } - public record Level(ResourceLocation texture, NativeImage image){ - public Level(ResourceLocation texture){ + public record Level(Identifier texture, NativeImage image){ + public Level(Identifier texture){ this(texture, readSecure(texture)); } - public static NativeImage readSecure(ResourceLocation texture){ + public static NativeImage readSecure(Identifier texture){ try { return NativeImage.read(Minecraft.getInstance().getResourceManager().open(texture)); } catch (IOException e) { @@ -62,6 +62,6 @@ public static NativeImage readSecure(ResourceLocation texture){ return null; } } - public static final Codec CODEC = ResourceLocation.CODEC.xmap(Level::new, Level::texture); + public static final Codec CODEC = Identifier.CODEC.xmap(Level::new, Level::texture); } } diff --git a/src/main/java/wily/factoryapi/base/client/UIAccessor.java b/src/main/java/wily/factoryapi/base/client/UIAccessor.java index 9a35999..cd6805e 100644 --- a/src/main/java/wily/factoryapi/base/client/UIAccessor.java +++ b/src/main/java/wily/factoryapi/base/client/UIAccessor.java @@ -12,7 +12,7 @@ import net.minecraft.client.gui.screens.inventory.MenuAccess; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.Slot; @@ -71,23 +71,23 @@ default void beforeInit(UIAccessor accessor) { putStaticElement("serverIp."+serverData.ip,true); Inventory inventory = Minecraft.getInstance().player == null ? null : Minecraft.getInstance().player.getInventory(); if (inventory != null) { - List items = inventory./*? if >1.21.4 {*//*getNonEquipmentItems()*//*?} else {*/items/*?}*/; + List items = inventory./*? if >1.21.4 {*/getNonEquipmentItems()/*?} else {*//*items*//*?}*/; for (int i = 0; i < items.size(); i++) { int index = i; getElements().put("inventory." + index, () -> items.get(index)); } //? if >1.21.4 { - /*Inventory.EQUIPMENT_SLOT_MAPPING.forEach((i, equipmentSlot)->{ + Inventory.EQUIPMENT_SLOT_MAPPING.forEach((i, equipmentSlot)->{ if (equipmentSlot == EquipmentSlot.OFFHAND) return; getElements().put("inventory.armor." + equipmentSlot.getIndex(), () -> inventory.getItem(i)); }); - *///?} else { - for (int i = 0; i < inventory.armor.size(); i++) { + //?} else { + /*for (int i = 0; i < inventory.armor.size(); i++) { int index = i; getElements().put("inventory.armor." + index, () -> inventory.armor.get(index)); } - //?} - getElements().put("inventory.offhand", () -> /*? if >1.21.4 {*//*inventory.getItem(Inventory.SLOT_OFFHAND)*//*?} else {*/inventory.offhand.get(0)/*?}*/); + *///?} + getElements().put("inventory.offhand", () -> /*? if >1.21.4 {*/inventory.getItem(Inventory.SLOT_OFFHAND)/*?} else {*//*inventory.offhand.get(0)*//*?}*/); } putSupplierComponent("username", () -> Component.literal(Minecraft.getInstance().getUser().getName())); if (getScreen() instanceof MenuAccess access) { @@ -216,19 +216,19 @@ default Renderable createModifiableRenderable(String name, Renderable renderable FactoryGuiMatrixStack.of(guiGraphics.pose()).pushPose(); int color = getInteger(name+".renderColor", 0xFFFFFFFF); //? if <1.21.6 { - FactoryScreenUtil.enableBlend(); + /*FactoryScreenUtil.enableBlend(); FactoryGuiGraphics.of(guiGraphics).setColor(color); - //?} else - //FactoryGuiGraphics.of(guiGraphics).setBlitColor(color); + *///?} else + FactoryGuiGraphics.of(guiGraphics).setBlitColor(color); FactoryGuiMatrixStack.of(guiGraphics.pose()).translate(getDouble(name + ".translateX", 0), getDouble(name + ".translateY", 0), getDouble(name + ".translateZ", 0)); FactoryGuiMatrixStack.of(guiGraphics.pose()).scale(getFloat(name + ".scaleX", 1), getFloat(name + ".scaleY", 1), getFloat(name + ".scaleZ", 1)); renderable.render(guiGraphics, i, j, f); FactoryGuiMatrixStack.of(guiGraphics.pose()).popPose(); FactoryScreenUtil.disableBlend(); //? if <1.21.6 { - FactoryGuiGraphics.of(guiGraphics).clearColor(); - //?} else - //FactoryGuiGraphics.of(guiGraphics).clearBlitColor(); + /*FactoryGuiGraphics.of(guiGraphics).clearColor(); + *///?} else + FactoryGuiGraphics.of(guiGraphics).clearBlitColor(); } }; @@ -298,12 +298,12 @@ default Boolean getBoolean(String name) { return getBoolean(name, false); } - default ResourceLocation getResourceLocation(String name, ResourceLocation defaultValue) { - return getElementValue(name, defaultValue, ResourceLocation.class); + default Identifier getIdentifier(String name, Identifier defaultValue) { + return getElementValue(name, defaultValue, Identifier.class); } - default ResourceLocation getResourceLocation(String name) { - return getResourceLocation(name, null); + default Identifier getIdentifier(String name) { + return getIdentifier(name, null); } default ItemStack getItemStack(String name) { diff --git a/src/main/java/wily/factoryapi/base/client/UIDefinitionManager.java b/src/main/java/wily/factoryapi/base/client/UIDefinitionManager.java index 92a71c3..06cf69a 100644 --- a/src/main/java/wily/factoryapi/base/client/UIDefinitionManager.java +++ b/src/main/java/wily/factoryapi/base/client/UIDefinitionManager.java @@ -3,18 +3,18 @@ import com.google.gson.JsonElement; import com.mojang.realmsclient.RealmsMainScreen; //? if >=1.21.6 { -/*import com.mojang.realmsclient.gui.screens.configuration.RealmsBackupScreen; +import com.mojang.realmsclient.gui.screens.configuration.RealmsBackupScreen; import com.mojang.realmsclient.gui.screens.configuration.RealmsInviteScreen; -*///?} else { -import com.mojang.realmsclient.gui.screens.RealmsBackupScreen; +//?} else { +/*import com.mojang.realmsclient.gui.screens.RealmsBackupScreen; import com.mojang.realmsclient.gui.screens.RealmsInviteScreen; -//?} +*///?} import com.mojang.realmsclient.gui.screens.RealmsConfirmScreen; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; import com.mojang.serialization.Dynamic; import com.mojang.serialization.JsonOps; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.components.AbstractSliderButton; @@ -23,12 +23,12 @@ import net.minecraft.client.gui.components.Checkbox; import net.minecraft.client.gui.screens.*; //? if <1.20.5 { -import net.minecraft.client.gui.screens.controls.ControlsScreen; +/*import net.minecraft.client.gui.screens.controls.ControlsScreen; import net.minecraft.client.gui.screens.controls.KeyBindsScreen; -//?} else { -/*import net.minecraft.client.gui.screens.options.*; +*///?} else { +import net.minecraft.client.gui.screens.options.*; import net.minecraft.client.gui.screens.options.controls.*; -*///?} +//?} import net.minecraft.client.gui.screens.achievement.StatsScreen; import net.minecraft.client.gui.screens.advancements.AdvancementsScreen; import net.minecraft.client.gui.screens.inventory.*; @@ -41,7 +41,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.realms.RealmsScreen; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.repository.PackRepository; import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceManager; @@ -63,11 +63,11 @@ public class UIDefinitionManager implements ResourceManagerReloadListener { public static final String UI_DEFINITIONS = "ui_definitions"; - public static final ListMap> NAMED_UI_TARGETS = new ListMap.Builder>().put("screen", Screen.class).put("accessibility_onboarding_screen", AccessibilityOnboardingScreen.class).put("title_screen",TitleScreen.class).put("options_screen", OptionsScreen.class).put("skin_customization_screen", SkinCustomizationScreen.class).put("video_settings_screen", VideoSettingsScreen.class).put("language_select_screen", LanguageSelectScreen.class).put("pack_selection_screen", PackSelectionScreen.class).put("telemetry_info_screen", TelemetryInfoScreen.class).put("online_options_screen", OnlineOptionsScreen.class).put("sound_options_screen", SoundOptionsScreen.class).put("controls_screen", ControlsScreen.class).put("mouse_settings_screen", MouseSettingsScreen.class).put("key_binds_screen", KeyBindsScreen.class).put("chat_options_screen", ChatOptionsScreen.class).put("accessibility_options_screen", AccessibilityOptionsScreen.class).put("credits_and_attribution_screen", CreditsAndAttributionScreen.class).put("win_screen", WinScreen.class).put("confirm_link_screen", ConfirmLinkScreen.class).put("select_world_screen", SelectWorldScreen.class).put("create_world_screen", CreateWorldScreen.class).put("edit_world_screen", EditWorldScreen.class).put("join_multiplayer_screen", JoinMultiplayerScreen.class)./*? if <1.21.9 {*/put("edit_server_screen", EditServerScreen.class)./*?}*/put("direct_join_server_screen", DirectJoinServerScreen.class).put("realms_main_screen", RealmsMainScreen.class).put("realms_screen", RealmsScreen.class).put("realms_confirm_screen", RealmsConfirmScreen.class).put("realms_backup_screen", RealmsBackupScreen.class).put("realms_invite_screen", RealmsInviteScreen.class).put("share_to_lan_screen", ShareToLanScreen.class).put("advancements_screen", AdvancementsScreen.class).put("stats_screen", StatsScreen.class).put("confirm_screen", ConfirmScreen.class).put("level_loading_screen", LevelLoadingScreen.class).put("progress_screen", ProgressScreen.class).put("generic_message_screen",/*? if <1.20.5 {*/GenericDirtMessageScreen/*?} else {*//*GenericMessageScreen*//*?}*/.class)./*? if <1.21.9 {*/put("receiving_level_screen", ReceivingLevelScreen.class)./*?}*/put("connect_screen", ConnectScreen.class).put("pause_screen", PauseScreen.class).put("inventory_screen", InventoryScreen.class).put("crafting_screen", CraftingScreen.class).put("container_screen", ContainerScreen.class).put("abstract_furnace_screen", AbstractFurnaceScreen.class).put("furnace_screen", FurnaceScreen.class).put("smoker_screen", SmokerScreen.class).put("blast_furnace_screen", BlastFurnaceScreen.class).put("loom_screen", LoomScreen.class).put("stonecutter_screen", StonecutterScreen.class).put("grindstone_screen", GrindstoneScreen.class).put("enchantment_screen", EnchantmentScreen.class).put("hopper_screen", HopperScreen.class).put("dispenser_screen", DispenserScreen.class).put("shulker_box_screen", ShulkerBoxScreen.class).put("anvil_screen", AnvilScreen.class).put("smithing_screen", SmithingScreen.class).put("brewing_stand_screen", BrewingStandScreen.class).put("beacon_screen", BeaconScreen.class).put("chat_screen", ChatScreen.class).put("in_bed_chat_screen", InBedChatScreen.class).put("gui", Gui.class).mapKeys(FactoryAPI::createVanillaLocation).build(); - public static final ListMap> DEFAULT_SCREENS_MAP = new ListMap.Builder>().put("title", s -> new TitleScreen()).put("options", s -> new OptionsScreen(s, Minecraft.getInstance().options)).put("language_select", s -> new LanguageSelectScreen(s, Minecraft.getInstance().options, Minecraft.getInstance().getLanguageManager())).put("video_settings", s -> new VideoSettingsScreen(s,/*? if >=1.21 {*//*Minecraft.getInstance() ,*//*?}*/ Minecraft.getInstance().options)).put("skin_customization", s -> new SkinCustomizationScreen(s, Minecraft.getInstance().options)).put("online_options", s -> /*? if <1.21 {*/OnlineOptionsScreen.createOnlineOptionsScreen(Minecraft.getInstance(), s, Minecraft.getInstance().options)/*?} else {*//*new OnlineOptionsScreen(s, Minecraft.getInstance().options)*//*?}*/).put("controls", s -> new ControlsScreen(s, Minecraft.getInstance().options)).put("mouse_settings", s -> new MouseSettingsScreen(s, Minecraft.getInstance().options)).put("key_binds", s -> new KeyBindsScreen(s, Minecraft.getInstance().options)).put("chat_options", s -> new ChatOptionsScreen(s, Minecraft.getInstance().options)).put("accessibility_options", s -> new AccessibilityOptionsScreen(s, Minecraft.getInstance().options)).put("credits_and_attribution", CreditsAndAttributionScreen::new).put("select_world", SelectWorldScreen::new).mapKeys(FactoryAPI::createVanillaLocation).build(); + public static final ListMap> NAMED_UI_TARGETS = new ListMap.Builder>().put("screen", Screen.class).put("accessibility_onboarding_screen", AccessibilityOnboardingScreen.class).put("title_screen",TitleScreen.class).put("options_screen", OptionsScreen.class).put("skin_customization_screen", SkinCustomizationScreen.class).put("video_settings_screen", VideoSettingsScreen.class).put("language_select_screen", LanguageSelectScreen.class).put("pack_selection_screen", PackSelectionScreen.class).put("telemetry_info_screen", TelemetryInfoScreen.class).put("online_options_screen", OnlineOptionsScreen.class).put("sound_options_screen", SoundOptionsScreen.class).put("controls_screen", ControlsScreen.class).put("mouse_settings_screen", MouseSettingsScreen.class).put("key_binds_screen", KeyBindsScreen.class).put("chat_options_screen", ChatOptionsScreen.class).put("accessibility_options_screen", AccessibilityOptionsScreen.class).put("credits_and_attribution_screen", CreditsAndAttributionScreen.class).put("win_screen", WinScreen.class).put("confirm_link_screen", ConfirmLinkScreen.class).put("select_world_screen", SelectWorldScreen.class).put("create_world_screen", CreateWorldScreen.class).put("edit_world_screen", EditWorldScreen.class).put("join_multiplayer_screen", JoinMultiplayerScreen.class)./*? if <1.21.9 {*//*put("edit_server_screen", EditServerScreen.class).*//*?}*/put("direct_join_server_screen", DirectJoinServerScreen.class).put("realms_main_screen", RealmsMainScreen.class).put("realms_screen", RealmsScreen.class).put("realms_confirm_screen", RealmsConfirmScreen.class).put("realms_backup_screen", RealmsBackupScreen.class).put("realms_invite_screen", RealmsInviteScreen.class).put("share_to_lan_screen", ShareToLanScreen.class).put("advancements_screen", AdvancementsScreen.class).put("stats_screen", StatsScreen.class).put("confirm_screen", ConfirmScreen.class).put("level_loading_screen", LevelLoadingScreen.class).put("progress_screen", ProgressScreen.class).put("generic_message_screen",/*? if <1.20.5 {*//*GenericDirtMessageScreen*//*?} else {*/GenericMessageScreen/*?}*/.class)./*? if <1.21.9 {*//*put("receiving_level_screen", ReceivingLevelScreen.class).*//*?}*/put("connect_screen", ConnectScreen.class).put("pause_screen", PauseScreen.class).put("inventory_screen", InventoryScreen.class).put("crafting_screen", CraftingScreen.class).put("container_screen", ContainerScreen.class).put("abstract_furnace_screen", AbstractFurnaceScreen.class).put("furnace_screen", FurnaceScreen.class).put("smoker_screen", SmokerScreen.class).put("blast_furnace_screen", BlastFurnaceScreen.class).put("loom_screen", LoomScreen.class).put("stonecutter_screen", StonecutterScreen.class).put("grindstone_screen", GrindstoneScreen.class).put("enchantment_screen", EnchantmentScreen.class).put("hopper_screen", HopperScreen.class).put("dispenser_screen", DispenserScreen.class).put("shulker_box_screen", ShulkerBoxScreen.class).put("anvil_screen", AnvilScreen.class).put("smithing_screen", SmithingScreen.class).put("brewing_stand_screen", BrewingStandScreen.class).put("beacon_screen", BeaconScreen.class).put("chat_screen", ChatScreen.class).put("in_bed_chat_screen", InBedChatScreen.class).put("gui", Gui.class).mapKeys(FactoryAPI::createVanillaLocation).build(); + public static final ListMap> DEFAULT_SCREENS_MAP = new ListMap.Builder>().put("title", s -> new TitleScreen()).put("options", s -> new OptionsScreen(s, Minecraft.getInstance().options)).put("language_select", s -> new LanguageSelectScreen(s, Minecraft.getInstance().options, Minecraft.getInstance().getLanguageManager())).put("video_settings", s -> new VideoSettingsScreen(s,/*? if >=1.21 {*/Minecraft.getInstance() ,/*?}*/ Minecraft.getInstance().options)).put("skin_customization", s -> new SkinCustomizationScreen(s, Minecraft.getInstance().options)).put("online_options", s -> /*? if <1.21 {*//*OnlineOptionsScreen.createOnlineOptionsScreen(Minecraft.getInstance(), s, Minecraft.getInstance().options)*//*?} else {*/new OnlineOptionsScreen(s, Minecraft.getInstance().options)/*?}*/).put("controls", s -> new ControlsScreen(s, Minecraft.getInstance().options)).put("mouse_settings", s -> new MouseSettingsScreen(s, Minecraft.getInstance().options)).put("key_binds", s -> new KeyBindsScreen(s, Minecraft.getInstance().options)).put("chat_options", s -> new ChatOptionsScreen(s, Minecraft.getInstance().options)).put("accessibility_options", s -> new AccessibilityOptionsScreen(s, Minecraft.getInstance().options)).put("credits_and_attribution", CreditsAndAttributionScreen::new).put("select_world", SelectWorldScreen::new).mapKeys(FactoryAPI::createVanillaLocation).build(); - public static void registerNamedUITarget(ResourceLocation id, Class uiClass) { + public static void registerNamedUITarget(Identifier id, Class uiClass) { NAMED_UI_TARGETS.put(id, uiClass); } @@ -75,7 +75,7 @@ public static void registerNamedUITarget(String path, Class uiClass) { registerNamedUITarget(FactoryAPI.createVanillaLocation(path), uiClass); } - public static void registerDefaultScreen(ResourceLocation id, Function defaultScreen) { + public static void registerDefaultScreen(Identifier id, Function defaultScreen) { DEFAULT_SCREENS_MAP.put(id, defaultScreen); } @@ -97,8 +97,8 @@ public void beforeInit(UIAccessor accessor) { } public interface WidgetAction { - ListMap> map = new ListMap.Builder>().put("open_default_screen", create(ResourceLocation.CODEC, (s) -> (a, w, t) -> Minecraft.getInstance().setScreen(DEFAULT_SCREENS_MAP.getOrDefault(s, s1 -> null).apply(a.getScreen())))).put("open_config_screen", create(Codec.STRING, (s) -> (a, w, t) -> Minecraft.getInstance().setScreen(FactoryAPIClient.getConfigScreen(FactoryAPIPlatform.getModInfo(s), a.getScreen())))).put("reload_ui", create(Codec.EMPTY.codec(), (s) -> (a, w, t) -> a.reloadUI())).put("run_command", createRunCommand(s -> true)).put("run_windows_command", createRunCommand(s -> Util.getPlatform() == Util.OS.WINDOWS)).put("run_linux_command", createRunCommand(s -> Util.getPlatform() == Util.OS.LINUX)).put("run_osx_command", createRunCommand(s -> Util.getPlatform() == Util.OS.OSX)).put("toggle_datapacks", createToggleDatapacks()).mapKeys(FactoryAPI::createVanillaLocation).build(); - Codec> CODEC = map.createCodec(ResourceLocation.CODEC); + ListMap> map = new ListMap.Builder>().put("open_default_screen", create(Identifier.CODEC, (s) -> (a, w, t) -> Minecraft.getInstance().setScreen(DEFAULT_SCREENS_MAP.getOrDefault(s, s1 -> null).apply(a.getScreen())))).put("open_config_screen", create(Codec.STRING, (s) -> (a, w, t) -> Minecraft.getInstance().setScreen(FactoryAPIClient.getConfigScreen(FactoryAPIPlatform.getModInfo(s), a.getScreen())))).put("reload_ui", create(Codec.EMPTY.codec(), (s) -> (a, w, t) -> a.reloadUI())).put("run_command", createRunCommand(s -> true)).put("run_windows_command", createRunCommand(s -> Util.getPlatform() == Util.OS.WINDOWS)).put("run_linux_command", createRunCommand(s -> Util.getPlatform() == Util.OS.LINUX)).put("run_osx_command", createRunCommand(s -> Util.getPlatform() == Util.OS.OSX)).put("toggle_datapacks", createToggleDatapacks()).mapKeys(FactoryAPI::createVanillaLocation).build(); + Codec> CODEC = map.createCodec(Identifier.CODEC); Codec

getCodec(); @@ -211,7 +211,7 @@ public static List parseIntRange(String s) { } public interface ElementType { - ListMap map = new ListMap<>(); + ListMap map = new ListMap<>(); ElementType CHILDREN = registerConditional("children", (definition, accessorFunction, name, e) -> parseAllElements(definition, accessorFunction, e, s -> e.get("applyPrefix").asBoolean(true) ? (name+"."+s) : s)); ElementType ADD_BUTTON = registerConditional("add_button", (definition, accessorFunction, name, e) -> { @@ -281,7 +281,7 @@ protected void applyValue() { ElementType PUT_COMPONENT = registerConditional("put_component", (definition, accessorFunction, name, e) -> parseElement(definition, name, e, "value", (s, d) -> parseComponentElement(name, d))); ElementType PUT_STRING = registerCodec("put_string", Codec.STRING); ElementType PUT_BOOLEAN = registerConditional("put_boolean", (definition, accessorFunction, name, e) -> parseElement(definition, name, e, "value", (s, d) -> parseBoolean(name, d))); - ElementType PUT_RESOURCE_LOCATION = registerCodec("put_resource_location", ResourceLocation.CODEC); + ElementType PUT_RESOURCE_LOCATION = registerCodec("put_resource_location", Identifier.CODEC); ElementType PUT_VEC3 = registerCodec("put_vec3", DynamicUtil.VEC3_OBJECT_CODEC); ElementType PUT_VEC2 = registerCodec("put_vec2", DynamicUtil.VEC2_CODEC); ElementType BLIT = registerConditional("blit", ElementType::parseBlitElements); @@ -306,8 +306,8 @@ protected void applyValue() { static void parseWidgetElements(UIDefinition uiDefinition, String elementName, Dynamic element) { parseElements(uiDefinition, elementName, element, ElementType::parseNumber, "x", "y", "width", "height", "order"); parseElements(uiDefinition, elementName, element, (s, d) -> parseComponentElement(elementName, s, d), "message", "tooltip"); - parseElement(uiDefinition, elementName, element, "spriteOverride", ResourceLocation.CODEC); - parseElement(uiDefinition, elementName, element, "highlightedSpriteOverride", ResourceLocation.CODEC); + parseElement(uiDefinition, elementName, element, "spriteOverride", Identifier.CODEC); + parseElement(uiDefinition, elementName, element, "highlightedSpriteOverride", Identifier.CODEC); parseElement(uiDefinition, elementName, element, "isVisible", ElementType::parseBoolean); } @@ -324,10 +324,10 @@ static void parseFillGradientElements(UIDefinition uiDefinition, Function accessorFunction, String elementName, Dynamic element) { - parseElement(uiDefinition, elementName, element, "texture", ResourceLocation.CODEC); + parseElement(uiDefinition, elementName, element, "texture", Identifier.CODEC); parseElements(uiDefinition, elementName, element, ElementType::parseNumber, "x", "y", "uvX", "uvY", "width", "height", "imageWidth", "imageHeight", "renderColor", "order", "amount"); parseTranslationElements(uiDefinition, elementName, element); - uiDefinition.addStatic(UIDefinition.createAfterInitWithAmount(elementName, a -> accessorFunction.apply(a).addRenderable(elementName, (a.createModifiableRenderable(elementName, (guiGraphics, i, j, f) -> a.getElement(elementName + ".texture", ResourceLocation.class).ifPresent(t -> FactoryGuiGraphics.of(guiGraphics).blit(t, a.getInteger(elementName + ".x", 0), a.getInteger(elementName + ".y", 0), a.getInteger(elementName + ".uvX", 0), a.getInteger(elementName + ".uvY", 0), a.getInteger(elementName + ".width", 0), a.getInteger(elementName + ".height", 0), a.getInteger(elementName + ".imageWidth", 256), a.getInteger(elementName + ".imageHeight", 256)))))))); + uiDefinition.addStatic(UIDefinition.createAfterInitWithAmount(elementName, a -> accessorFunction.apply(a).addRenderable(elementName, (a.createModifiableRenderable(elementName, (guiGraphics, i, j, f) -> a.getElement(elementName + ".texture", Identifier.class).ifPresent(t -> FactoryGuiGraphics.of(guiGraphics).blit(t, a.getInteger(elementName + ".x", 0), a.getInteger(elementName + ".y", 0), a.getInteger(elementName + ".uvX", 0), a.getInteger(elementName + ".uvY", 0), a.getInteger(elementName + ".width", 0), a.getInteger(elementName + ".height", 0), a.getInteger(elementName + ".imageWidth", 256), a.getInteger(elementName + ".imageHeight", 256)))))))); } static void parseTranslationElements(UIDefinition uiDefinition, String elementName, Dynamic element) { @@ -335,10 +335,10 @@ static void parseTranslationElements(UIDefinition uiDefinition, String elementNa } static void parseBlitSpriteElements(UIDefinition uiDefinition, Function accessorFunction, String elementName, Dynamic element) { - parseElement(uiDefinition, elementName, element, "sprite", ResourceLocation.CODEC); + parseElement(uiDefinition, elementName, element, "sprite", Identifier.CODEC); parseElements(uiDefinition, elementName, element, ElementType::parseNumber, "x", "y", "width", "height", "renderColor", "order", "amount"); parseTranslationElements(uiDefinition, elementName, element); - uiDefinition.addStatic(UIDefinition.createAfterInitWithAmount(elementName, a -> accessorFunction.apply(a).addRenderable(elementName, (a.createModifiableRenderable(elementName, (guiGraphics, i, j, f) -> a.getElement(elementName + ".sprite", ResourceLocation.class).ifPresent(t -> FactoryGuiGraphics.of(guiGraphics).blitSprite(t, a.getInteger(elementName + ".x", 0), a.getInteger(elementName + ".y", 0), a.getInteger(elementName + ".width", 0), a.getInteger(elementName + ".height", 0)))))))); + uiDefinition.addStatic(UIDefinition.createAfterInitWithAmount(elementName, a -> accessorFunction.apply(a).addRenderable(elementName, (a.createModifiableRenderable(elementName, (guiGraphics, i, j, f) -> a.getElement(elementName + ".sprite", Identifier.class).ifPresent(t -> FactoryGuiGraphics.of(guiGraphics).blitSprite(t, a.getInteger(elementName + ".x", 0), a.getInteger(elementName + ".y", 0), a.getInteger(elementName + ".width", 0), a.getInteger(elementName + ".height", 0)))))))); } static void parseTextElements(UIDefinition uiDefinition, String elementName, Dynamic element) { @@ -453,10 +453,10 @@ static UIDefinition parseBooleanElement(String elementName, String field, Dy } static UIDefinition parseExternalComponentElement(String elementName, String field, Dynamic element) { - return element.get("baseDir").flatMap(ResourceLocation.CODEC::parse).result().map(r-> { + return element.get("baseDir").flatMap(Identifier.CODEC::parse).result().map(r-> { Map componentByLang = new HashMap<>(); for (String s : Minecraft.getInstance().getLanguageManager().getLanguages().keySet()) { - ResourceLocation location = r.withSuffix("/" + s + ".txt"); + Identifier location = r.withSuffix("/" + s + ".txt"); Optional externalComponent = Minecraft.getInstance().getResourceManager().getResource(location); externalComponent.ifPresent(resource -> { MutableComponent c = Component.empty(); @@ -508,14 +508,14 @@ static Optional> parseElementReference(String field, Dynamic } static ElementType get(String id) { - return get(ResourceLocation.tryParse(id)); + return get(Identifier.tryParse(id)); } - static ElementType get(ResourceLocation id) { + static ElementType get(Identifier id) { return map.getOrDefault(id, PUT_NUMBER); } - static ResourceLocation getId(ElementType type) { + static Identifier getId(ElementType type) { return map.getKeyOrDefault(type, null); } @@ -551,13 +551,13 @@ static ElementType register(String path, ElementType type) { return register(FactoryAPI.createVanillaLocation(path), type); } - static ElementType register(ResourceLocation id, ElementType type) { + static ElementType register(Identifier id, ElementType type) { map.put(id, type); return type; } } - public final ListMap map = new ListMap<>(); + public final ListMap map = new ListMap<>(); public final List staticList = new ArrayList<>(); public final void applyStatic(UIAccessor accessor) { @@ -609,7 +609,7 @@ public static UIDefinition.Instance fromDynamic(String name, Dynamic dyna public static UIDefinition.Instance fromDynamicWithTarget(String name, Dynamic dynamic) { String targetType = dynamic.get("targetType").asString("id"); - Class targetClass = dynamic.get("targetUI").asString().map(s -> targetType.equals("id") ? NAMED_UI_TARGETS.get(ResourceLocation.tryParse(s)) : targetType.equals("class") ? getClassFromString(name, s) : null).result().orElse(null); + Class targetClass = dynamic.get("targetUI").asString().map(s -> targetType.equals("id") ? NAMED_UI_TARGETS.get(Identifier.tryParse(s)) : targetType.equals("class") ? getClassFromString(name, s) : null).result().orElse(null); Component targetTitle = targetType.equals("screenTitle") ? dynamic.get("targetUI").flatMap(DynamicUtil.getComponentCodec()::parse).result().orElse(null) : null; String targetRange = dynamic.get("targetRange").asString("instance"); @@ -632,7 +632,7 @@ private static void handleDeprecatedDefinitionsAddition(UIDefinition uiDefinitio uiDefinition.getDefinitions().clear(); } - public void openDefaultScreenAndAddDefinition(Optional defaultScreen, UIDefinition uiDefinition) { + public void openDefaultScreenAndAddDefinition(Optional defaultScreen, UIDefinition uiDefinition) { Screen s = defaultScreen.map(DEFAULT_SCREENS_MAP::get).orElse(parent-> new Screen(Component.empty()) {}).apply(Minecraft.getInstance().screen); UIAccessor.of(s).addStatic(uiDefinition); Minecraft.getInstance().setScreen(s); diff --git a/src/main/java/wily/factoryapi/base/client/WidgetAccessor.java b/src/main/java/wily/factoryapi/base/client/WidgetAccessor.java index ed1daff..b883e54 100644 --- a/src/main/java/wily/factoryapi/base/client/WidgetAccessor.java +++ b/src/main/java/wily/factoryapi/base/client/WidgetAccessor.java @@ -1,7 +1,7 @@ package wily.factoryapi.base.client; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import wily.factoryapi.base.ArbitrarySupplier; import java.util.function.BooleanSupplier; @@ -12,11 +12,11 @@ static WidgetAccessor of(AbstractWidget widget){ return (WidgetAccessor) widget; } - void setSpriteOverride(ResourceLocation sprite); + void setSpriteOverride(Identifier sprite); - void setHighlightedSpriteOverride(ResourceLocation sprite); + void setHighlightedSpriteOverride(Identifier sprite); - ResourceLocation getSpriteOverride(); + Identifier getSpriteOverride(); Consumer getOnPressOverride(); diff --git a/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableButton.java b/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableButton.java index f2d5b26..be4a195 100644 --- a/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableButton.java +++ b/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableButton.java @@ -4,8 +4,8 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.navigation.ScreenRectangle; //? if >=1.21.9 { -/*import net.minecraft.client.input.MouseButtonEvent; -*///?} +import net.minecraft.client.input.MouseButtonEvent; +//?} import org.jetbrains.annotations.Nullable; import wily.factoryapi.base.client.FactoryGuiGraphics; import wily.factoryapi.util.FactoryScreenUtil; @@ -67,7 +67,7 @@ public boolean isMouseOver(double d, double e) { } //? if >=1.21.9 { - /*@Override + @Override public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) { return handleClick(mouseButtonEvent.x(), mouseButtonEvent.y(), mouseButtonEvent.button()); } @@ -82,8 +82,8 @@ public boolean mouseDragged(MouseButtonEvent mouseButtonEvent, double d, double return handleDragging(mouseButtonEvent.x(), mouseButtonEvent.y(), mouseButtonEvent.button(), d, e); } - *///?} else { - @Override + //?} else { + /*@Override public boolean mouseClicked(double d, double e, int i) { return handleClick(d, e, i); } @@ -97,7 +97,7 @@ public boolean mouseReleased(double d, double e, int i) { public boolean mouseDragged(double mouseX, double mouseY, int i, double f, double g) { return handleDragging(mouseX, mouseY, i, f, g); } - //?} + *///?} public boolean handleClick(double d, double e, int i) { if (inMouseLimit(d,e) && visible.get()) { @@ -130,15 +130,15 @@ public void draw(GuiGraphics graphics) { public void draw(GuiGraphics graphics, int x, int y) { if (color != null) //? if <1.21.6 { - FactoryGuiGraphics.of(graphics).setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1.0F); - //?} else - //FactoryGuiGraphics.of(graphics).setBlitColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); + /*FactoryGuiGraphics.of(graphics).setColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1.0F); + *///?} else + FactoryGuiGraphics.of(graphics).setBlitColor(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); super.draw(graphics, x, y); if (color != null) //? if <1.21.6 { - FactoryGuiGraphics.of(graphics).clearColor(); - //?} else - //FactoryGuiGraphics.of(graphics).clearBlitColor(); + /*FactoryGuiGraphics.of(graphics).clearColor(); + *///?} else + FactoryGuiGraphics.of(graphics).clearBlitColor(); if (isSelected() || hovered && hoverSelection) { if (selection != null) selection.draw(graphics, x, y); else { diff --git a/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableStatic.java b/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableStatic.java index 04598b5..636d880 100644 --- a/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableStatic.java +++ b/src/main/java/wily/factoryapi/base/client/drawable/AbstractDrawableStatic.java @@ -6,7 +6,7 @@ import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.renderer.Rect2i; import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import wily.factoryapi.base.client.FactoryGuiMatrixStack; import wily.factoryapi.util.FluidInstance; @@ -76,7 +76,7 @@ public boolean inMouseLimit(double mouseX, double mouseY) { return drawable.inMouseLimit(mouseX,mouseY,getX(),getY()); } - public ResourceLocation texture() {return drawable.texture();} + public Identifier texture() {return drawable.texture();} public int width() {return getWidth();} public int height() {return getHeight();} public int uvX() {return drawable.uvX();} @@ -88,9 +88,9 @@ public void render(GuiGraphics guiGraphics, int i, int j, float f) { hovered = inMouseLimit(i,j); draw(guiGraphics); //? if >=1.21.6 { - /*if (hovered && !tooltips.isEmpty()) guiGraphics.setTooltipForNextFrame(mc.font, tooltips.stream().map(Component::getVisualOrderText).toList(), i, j); - *///?} else { - if (hovered && !tooltips.isEmpty()) guiGraphics.renderComponentTooltip(mc.font, tooltips,i,j); - //?} + if (hovered && !tooltips.isEmpty()) guiGraphics.setTooltipForNextFrame(mc.font, tooltips.stream().map(Component::getVisualOrderText).toList(), i, j); + //?} else { + /*if (hovered && !tooltips.isEmpty()) guiGraphics.renderComponentTooltip(mc.font, tooltips,i,j); + *///?} } } diff --git a/src/main/java/wily/factoryapi/base/client/drawable/IFactoryDrawableType.java b/src/main/java/wily/factoryapi/base/client/drawable/IFactoryDrawableType.java index ff7df8c..b37e6cc 100644 --- a/src/main/java/wily/factoryapi/base/client/drawable/IFactoryDrawableType.java +++ b/src/main/java/wily/factoryapi/base/client/drawable/IFactoryDrawableType.java @@ -2,7 +2,7 @@ import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import wily.factoryapi.base.client.FactoryGuiGraphics; import wily.factoryapi.base.Progress; import wily.factoryapi.util.FactoryScreenUtil; @@ -14,7 +14,7 @@ public interface IFactoryDrawableType { public void draw(GuiGraphics graphics, int x, int y) { } - public ResourceLocation texture() { + public Identifier texture() { return null; } @@ -43,10 +43,10 @@ static IFactoryDrawableType empty(){ return EMPTY; } - ResourceLocation texture(); + Identifier texture(); - record DrawableImage(ResourceLocation texture, int uvX, int uvY, int width, int height, boolean isSprite) implements IFactoryDrawableType { - public DrawableImage(ResourceLocation texture, int uvX, int uvY, int width, int height){ + record DrawableImage(Identifier texture, int uvX, int uvY, int width, int height, boolean isSprite) implements IFactoryDrawableType { + public DrawableImage(Identifier texture, int uvX, int uvY, int width, int height){ this(texture,uvX,uvY,width,height,false); } @@ -59,15 +59,15 @@ public DrawableStatic createStatic(int posX, int posY){ } } - static DrawableImage create(ResourceLocation texture, int uvX, int uvY, int width, int height){ + static DrawableImage create(Identifier texture, int uvX, int uvY, int width, int height){ return new DrawableImage(texture, uvX, uvY, width, height); } - static DrawableImage create(ResourceLocation texture, int width, int height){ + static DrawableImage create(Identifier texture, int width, int height){ return new DrawableImage(texture, 0, 0, width, height); } - static DrawableImage create(ResourceLocation texture, int width, int height, boolean isSprite){ + static DrawableImage create(Identifier texture, int width, int height, boolean isSprite){ return new DrawableImage(texture, 0, 0, width, height, isSprite); } @@ -117,7 +117,7 @@ default void draw(GuiGraphics graphics, int x, int y) { interface Wrapper extends IFactoryDrawableType { IFactoryDrawableType drawable(); @Override - default ResourceLocation texture() { + default Identifier texture() { return drawable().texture(); } diff --git a/src/main/java/wily/factoryapi/base/client/screen/FactoryConfigScreen.java b/src/main/java/wily/factoryapi/base/client/screen/FactoryConfigScreen.java index 01c8ad0..619062d 100644 --- a/src/main/java/wily/factoryapi/base/client/screen/FactoryConfigScreen.java +++ b/src/main/java/wily/factoryapi/base/client/screen/FactoryConfigScreen.java @@ -102,16 +102,16 @@ public static Entry small(AbstractWidget arg, @Nullable AbstractWidget arg2, Scr } //? if >=1.21.9 { - /*@Override + @Override public void renderContent(GuiGraphics guiGraphics, int i, int j, boolean bl, float f) { renderContent(guiGraphics, i, j, bl, f, getContentY()); } - *///?} else { - @Override + //?} else { + /*@Override public void render(GuiGraphics arg, int i, int j, int k, int l, int m, int n, int o, boolean bl, float f) { renderContent(arg, n, o, bl, f, j); } - //?} + *///?} public void renderContent(GuiGraphics guiGraphics, int i, int j, boolean bl, float f, int contentY) { int p = 0; diff --git a/src/main/java/wily/factoryapi/base/config/FactoryConfig.java b/src/main/java/wily/factoryapi/base/config/FactoryConfig.java index 7b050ef..0de9a6a 100644 --- a/src/main/java/wily/factoryapi/base/config/FactoryConfig.java +++ b/src/main/java/wily/factoryapi/base/config/FactoryConfig.java @@ -6,12 +6,12 @@ import com.google.gson.JsonParser; import com.google.gson.stream.JsonWriter; import com.mojang.serialization.*; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; //? if >=1.21.11 { -/*import net.minecraft.server.permissions.Permission; +import net.minecraft.server.permissions.Permission; import net.minecraft.server.permissions.PermissionLevel; -*///?} +//?} import net.minecraft.util.GsonHelper; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; @@ -45,9 +45,9 @@ * @param Type stored in the config instance */ public interface FactoryConfig extends Bearer { - ListMap COMMON_STORAGES = new ListMap<>(); + ListMap COMMON_STORAGES = new ListMap<>(); - static StorageHandler registerCommonStorage(ResourceLocation location, StorageHandler handler) { + static StorageHandler registerCommonStorage(Identifier location, StorageHandler handler) { COMMON_STORAGES.put(location, handler); return handler; } @@ -104,7 +104,7 @@ default boolean allowSync() { } default boolean allowClientSync(Player player) { - return allowSync() && (player != null && (player/*? if >=1.21.11 {*//*.permissions().hasPermission*//*?} else {*/.hasPermissions/*?}*/(/*? if >=1.21.11 {*//*new Permission.HasCommandLevel(PermissionLevel.GAMEMASTERS)*//*?} else {*/2/*?}*/) || FactoryAPIPlatform.getEntityServer(player).isSingleplayerOwner(/*? if >=1.21.9 {*//*player.nameAndId()*//*?} else {*/player.getGameProfile()/*?}*/))); + return allowSync() && (player != null && (player/*? if >=1.21.11 {*/.permissions().hasPermission/*?} else {*//*.hasPermissions*//*?}*/(/*? if >=1.21.11 {*/new Permission.HasCommandLevel(PermissionLevel.GAMEMASTERS)/*?} else {*//*2*//*?}*/) || FactoryAPIPlatform.getEntityServer(player).isSingleplayerOwner(/*? if >=1.21.9 {*/player.nameAndId()/*?} else {*//*player.getGameProfile()*//*?}*/))); } } diff --git a/src/main/java/wily/factoryapi/base/fabric/CraftyEnergyStorage.java b/src/main/java/wily/factoryapi/base/fabric/CraftyEnergyStorage.java index 91f2ea2..73c7c0f 100644 --- a/src/main/java/wily/factoryapi/base/fabric/CraftyEnergyStorage.java +++ b/src/main/java/wily/factoryapi/base/fabric/CraftyEnergyStorage.java @@ -5,7 +5,7 @@ import net.fabricmc.fabric.api.lookup.v1.item.ItemApiLookup; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import wily.factoryapi.FactoryAPI; import wily.factoryapi.base.ICraftyEnergyStorage; diff --git a/src/main/java/wily/factoryapi/base/network/CommonConfigSyncPayload.java b/src/main/java/wily/factoryapi/base/network/CommonConfigSyncPayload.java index c9622e3..49c64fc 100644 --- a/src/main/java/wily/factoryapi/base/network/CommonConfigSyncPayload.java +++ b/src/main/java/wily/factoryapi/base/network/CommonConfigSyncPayload.java @@ -3,12 +3,12 @@ import com.mojang.serialization.Dynamic; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtOps; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerPlayer; //? if >=1.21.11 { -/*import net.minecraft.server.permissions.Permission; +import net.minecraft.server.permissions.Permission; import net.minecraft.server.permissions.PermissionLevel; -*///?} +//?} import net.minecraft.world.entity.player.Player; import wily.factoryapi.FactoryAPI; import wily.factoryapi.FactoryAPIPlatform; @@ -17,7 +17,7 @@ import java.util.Map; import java.util.function.Supplier; -public record CommonConfigSyncPayload(CommonNetwork.Identifier identifier, ResourceLocation commonConfigStorage, CompoundTag configTag) implements CommonNetwork.Payload { +public record CommonConfigSyncPayload(CommonNetwork.Identifier identifier, Identifier commonConfigStorage, CompoundTag configTag) implements CommonNetwork.Payload { public static final CommonNetwork.Identifier ID_S2C = CommonNetwork.Identifier.create(FactoryAPI.createModLocation("common_config_sync_s2c"),CommonConfigSyncPayload::createS2C); public static final CommonNetwork.Identifier ID_C2S = CommonNetwork.Identifier.create(FactoryAPI.createModLocation("common_config_sync_c2s"),CommonConfigSyncPayload::createC2S); @@ -29,7 +29,7 @@ public static CommonConfigSyncPayload of(CommonNetwork.Identifier identifier, CommonNetwork.PlayBuf playBuf){ - this(identifier, playBuf.get().readResourceLocation(), playBuf.get().readNbt()); + this(identifier, playBuf.get().readIdentifier(), playBuf.get().readNbt()); } public static CommonConfigSyncPayload createS2C(CommonNetwork.PlayBuf playBuf){ @@ -43,7 +43,7 @@ public static CommonConfigSyncPayload createC2S(CommonNetwork.PlayBuf playBuf){ @Override public void apply(Context context) { FactoryConfig.COMMON_STORAGES.get(commonConfigStorage).decodeConfigs(new Dynamic<>(NbtOps.INSTANCE, configTag)); - if (!context.isClient() && context.player() instanceof ServerPlayer sp && sp/*? if >=1.21.11 {*//*.permissions().hasPermission*//*?} else {*/.hasPermissions/*?}*/(/*? if >=1.21.11 {*//*new Permission.HasCommandLevel(PermissionLevel.GAMEMASTERS)*//*?} else {*/2/*?}*/)){ + if (!context.isClient() && context.player() instanceof ServerPlayer sp && sp/*? if >=1.21.11 {*/.permissions().hasPermission/*?} else {*//*.hasPermissions*//*?}*/(/*? if >=1.21.11 {*/new Permission.HasCommandLevel(PermissionLevel.GAMEMASTERS)/*?} else {*//*2*//*?}*/)){ FactoryConfig.StorageHandler handler = FactoryConfig.COMMON_STORAGES.get(commonConfigStorage); CommonNetwork.sendToPlayers(FactoryAPIPlatform.getEntityServer(sp).getPlayerList().getPlayers(), new CommonConfigSyncPayload(ID_S2C, commonConfigStorage, configTag)); handler.save(); @@ -52,7 +52,7 @@ public void apply(Context context) { @Override public void encode(CommonNetwork.PlayBuf playBuf) { - playBuf.get().writeResourceLocation(commonConfigStorage); + playBuf.get().writeIdentifier(commonConfigStorage); playBuf.get().writeNbt(configTag); } diff --git a/src/main/java/wily/factoryapi/base/network/CommonNetwork.java b/src/main/java/wily/factoryapi/base/network/CommonNetwork.java index 69e1317..7ef67b1 100644 --- a/src/main/java/wily/factoryapi/base/network/CommonNetwork.java +++ b/src/main/java/wily/factoryapi/base/network/CommonNetwork.java @@ -1,24 +1,21 @@ package wily.factoryapi.base.network; //? >=1.20.5 { -/*import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -*///?} +//?} import io.netty.buffer.Unpooled; -import it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap;import it.unimi.dsi.fastutil.objects.Object2BooleanMap; import net.minecraft.network.FriendlyByteBuf; //? if >1.20.1 { -import net.minecraft.network.protocol.PacketFlow; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.network.chat.ComponentSerialization; //?} -import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; //? if fabric { import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; +import net.fabricmc.fabric.api.networking.v1.FriendlyByteBufs; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; //?} elif forge { /*import net.minecraftforge.network.NetworkDirection; @@ -33,14 +30,11 @@ *///?} import net.minecraft.world.item.ItemStack; import net.minecraft.network.chat.Component; -import org.apache.commons.lang3.tuple.Pair; import wily.factoryapi.FactoryAPI; import wily.factoryapi.FactoryAPIClient; import wily.factoryapi.FactoryAPIPlatform; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.UUID; import java.util.function.Function; import java.util.function.Supplier; @@ -51,33 +45,33 @@ public interface CommonNetwork { Multimap ENABLED_PLAYERS = HashMultimap.create(); interface Identifier{ - net.minecraft.resources.ResourceLocation location(); - T decode(/*? if <1.20.5 {*/FriendlyByteBuf/*?} else {*/ /*RegistryFriendlyByteBuf *//*?}*/ buf); + net.minecraft.resources.Identifier location(); + T decode(/*? if <1.20.5 {*//*FriendlyByteBuf*//*?} else {*/ RegistryFriendlyByteBuf /*?}*/ buf); //? >=1.20.5 { - /*CustomPacketPayload.Type type(); + CustomPacketPayload.Type type(); StreamCodec codec(); - *///?} - static CommonNetwork.Identifier create(net.minecraft.resources.ResourceLocation location, Supplier decoder){ + //?} + static CommonNetwork.Identifier create(net.minecraft.resources.Identifier location, Supplier decoder){ return create(location,b->decoder.get()); } - static CommonNetwork.Identifier create(net.minecraft.resources.ResourceLocation location, Function decoder){ + static CommonNetwork.Identifier create(net.minecraft.resources.Identifier location, Function decoder){ //? >=1.20.5 { - /*CustomPacketPayload.Type type = new CustomPacketPayload.Type<>(location); + CustomPacketPayload.Type type = new CustomPacketPayload.Type<>(location); StreamCodec codec = StreamCodec.of((b,p)->p.encode(b),b->decoder.apply(()->b)); - *///?} + //?} return new CommonNetwork.Identifier<>() { @Override - public net.minecraft.resources.ResourceLocation location() { + public net.minecraft.resources.Identifier location() { return location; } @Override - public T decode(/*? if <1.20.5 {*/FriendlyByteBuf/*?} else {*/ /*RegistryFriendlyByteBuf *//*?}*/ buf) { + public T decode(/*? if <1.20.5 {*//*FriendlyByteBuf*//*?} else {*/ RegistryFriendlyByteBuf /*?}*/ buf) { return decoder.apply(()->buf); } //? >=1.20.5 { - /*@Override + @Override public CustomPacketPayload.Type type() { return type; } @@ -86,22 +80,22 @@ public CustomPacketPayload.Type type() { public StreamCodec codec() { return codec; } - *///?} + //?} }; } } - interface PlayBuf extends Supplier{ + interface PlayBuf extends Supplier{ static PlayBuf create() { return fromBuf(new FriendlyByteBuf(Unpooled.buffer())); } - static PlayBuf of(/*? if <1.20.5 {*/FriendlyByteBuf/*?} else {*/ /*RegistryFriendlyByteBuf *//*?}*/buf) { + static PlayBuf of(/*? if <1.20.5 {*//*FriendlyByteBuf*//*?} else {*/ RegistryFriendlyByteBuf /*?}*/buf) { return ()-> buf; } static PlayBuf fromBuf(FriendlyByteBuf buf) { - return of(/*? if <1.20.5 {*/buf/*?} else {*//*new RegistryFriendlyByteBuf(buf, FactoryAPIPlatform.getRegistryAccess())*//*?}*/); + return of(/*? if <1.20.5 {*//*buf*//*?} else {*/new RegistryFriendlyByteBuf(buf, FactoryAPIPlatform.getRegistryAccess())/*?}*/); } } @@ -162,27 +156,27 @@ default void applySided(boolean client, Supplier player){ CommonNetwork.Identifier identifier(); - default void encode(/*? if <1.20.5 {*/FriendlyByteBuf/*?} else {*/ /*RegistryFriendlyByteBuf *//*?}*/ buf){ + default void encode(/*? if <1.20.5 {*//*FriendlyByteBuf*//*?} else {*/ RegistryFriendlyByteBuf /*?}*/ buf){ encode(()->buf); } void encode(PlayBuf buf); //? >=1.20.5 { - /*@Override + @Override default Type type(){ return identifier().type(); } - *///?} else if >1.20.1 { + //?} else if >1.20.1 { - default void write(FriendlyByteBuf buf){ + /*default void write(FriendlyByteBuf buf){ encode(buf); } - default ResourceLocation id(){ + default Identifier id(){ return identifier().location(); } - //?} + *///?} } abstract class EmptyPayload implements Payload{ @@ -210,11 +204,11 @@ static void sendToPlayer(ServerPlayer serverPl if (!bypassCheck && !ENABLED_PLAYERS.get(serverPlayer.getUUID()).contains(payload.identifier().location().getNamespace())) return; //? if fabric { //? if <1.20.5 { - FriendlyByteBuf buf = PacketByteBufs.create(); + /*FriendlyByteBuf buf = PacketByteBufs.create(); payload.encode(buf); ServerPlayNetworking.send(serverPlayer,payload.identifier().location(), buf); - //?} else - //ServerPlayNetworking.send(serverPlayer,payload); + *///?} else + ServerPlayNetworking.send(serverPlayer,payload); //?} elif forge { /*//? if <1.20.5 { FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer()); @@ -248,11 +242,11 @@ static void sendToServer(T payload, boolean by if (!FactoryAPI.isClient() || !bypassCheck && !FactoryAPIClient.hasModOnServer(payload.identifier().location().getNamespace())) return; //? if fabric { //? if <1.20.5 { - FriendlyByteBuf buf = PacketByteBufs.create(); + /*FriendlyByteBuf buf = PacketByteBufs.create(); payload.encode(buf); ClientPlayNetworking.send(payload.identifier().location(),buf); - //?} else - //ClientPlayNetworking.send(payload); + *///?} else + ClientPlayNetworking.send(payload); //?} elif forge { /*//? if <1.20.5 { FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer()); @@ -274,19 +268,19 @@ static void sendToServer(T payload, boolean by } static void encodeComponent(PlayBuf buf, Component component){ - /*? if >=1.20.5 {*/ /*ComponentSerialization.STREAM_CODEC.encode(buf.get(),component) *//*?} else {*/ buf.get().writeComponent(component)/*?}*/; + /*? if >=1.20.5 {*/ ComponentSerialization.STREAM_CODEC.encode(buf.get(),component) /*?} else {*/ /*buf.get().writeComponent(component)*//*?}*/; } static Component decodeComponent(PlayBuf buf){ - return /*? if >=1.20.5 {*/ /*ComponentSerialization.STREAM_CODEC.decode(buf.get()) *//*?} else {*/ buf.get().readComponent()/*?}*/; + return /*? if >=1.20.5 {*/ ComponentSerialization.STREAM_CODEC.decode(buf.get()) /*?} else {*/ /*buf.get().readComponent()*//*?}*/; } static void encodeItemStack(PlayBuf buf, ItemStack stack){ - /*? if >=1.20.5 {*/ /*ItemStack.OPTIONAL_STREAM_CODEC.encode(buf.get(),stack) *//*?} else {*/ buf.get().writeItem(stack)/*?}*/; + /*? if >=1.20.5 {*/ ItemStack.OPTIONAL_STREAM_CODEC.encode(buf.get(),stack) /*?} else {*/ /*buf.get().writeItem(stack)*//*?}*/; } static ItemStack decodeItemStack(PlayBuf buf){ - return /*? if >=1.20.5 {*/ /*ItemStack.OPTIONAL_STREAM_CODEC.decode(buf.get()) *//*?} else {*/ buf.get().readItem()/*?}*/; + return /*? if >=1.20.5 {*/ ItemStack.OPTIONAL_STREAM_CODEC.decode(buf.get()) /*?} else {*/ /*buf.get().readItem()*//*?}*/; } static void encodeBuf(PlayBuf buf, PlayBuf toEncode){ diff --git a/src/main/java/wily/factoryapi/base/network/CommonRecipeManager.java b/src/main/java/wily/factoryapi/base/network/CommonRecipeManager.java index e3f4a58..3f8a36f 100644 --- a/src/main/java/wily/factoryapi/base/network/CommonRecipeManager.java +++ b/src/main/java/wily/factoryapi/base/network/CommonRecipeManager.java @@ -1,16 +1,16 @@ package wily.factoryapi.base.network; //? if >=1.21.2 { -/*import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -*///?} else { -import wily.factoryapi.FactoryAPI; +//?} else { +/*import wily.factoryapi.FactoryAPI; import wily.factoryapi.FactoryAPIClient; import wily.factoryapi.mixin.base.RecipeManagerAccessor; -//?} -import net.minecraft.resources.ResourceLocation; +*///?} +import net.minecraft.resources.Identifier; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -30,37 +30,37 @@ public class CommonRecipeManager { - public static > /*? if >1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/ byId(ResourceLocation id, RecipeType type) { - return (/*? if >1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/)/*? if <1.21.2 {*/getRecipeManager().byKey(id).orElse(null)/*?} else {*//*recipesByType.getOrDefault(type, Collections.emptyMap()).get(id)*//*?}*/; + public static > /*? if >1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/ byId(Identifier id, RecipeType type) { + return (/*? if >1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/)/*? if <1.21.2 {*//*getRecipeManager().byKey(id).orElse(null)*//*?} else {*/recipesByType.getOrDefault(type, Collections.emptyMap()).get(id)/*?}*/; } public static > Collection1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/> byType(RecipeType type) { - return /*? if <1.21.2 {*/ ((RecipeManagerAccessor)getRecipeManager()).getRecipeByType(type)/*? if <1.20.5 {*/.values()/*?}*//*?} else {*//*(Collection) recipesByType.get(type).values()*//*?}*/; + return /*? if <1.21.2 {*/ /*((RecipeManagerAccessor)getRecipeManager()).getRecipeByType(type)/^? if <1.20.5 {^//^.values()^//^?}^/*//*?} else {*/(Collection) recipesByType.get(type).values()/*?}*/; } - public static , I extends /*? if <1.20.5 {*/Container/*?} else {*//*RecipeInput*//*?}*/> Optional1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/> getRecipeFor(RecipeType type, I input, Level level) { + public static , I extends /*? if <1.20.5 {*//*Container*//*?} else {*/RecipeInput/*?}*/> Optional1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/> getRecipeFor(RecipeType type, I input, Level level) { Collection1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/> recipes = byType(type); for (/*? if >1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/ recipe : recipes) { if (recipe/*? if >1.20.1 {*/.value()/*?}*/.matches(input,level)) return Optional.of(recipe); } return Optional.empty(); } - public static , I extends /*? if <1.20.5 {*/Container/*?} else {*//*RecipeInput*//*?}*/> Optional getResultFor(RecipeType type, I input, Level level) { + public static , I extends /*? if <1.20.5 {*//*Container*//*?} else {*/RecipeInput/*?}*/> Optional getResultFor(RecipeType type, I input, Level level) { return getRecipeFor(type,input,level).map(r->r/*? if >1.20.1 {*/.value()/*?}*/.assemble(input,level.registryAccess())); } //? if <1.21.2 { - public static RecipeManager getRecipeManager(){ + /*public static RecipeManager getRecipeManager(){ return FactoryAPI.currentServer == null ? FactoryAPIClient.getRecipeManager() : FactoryAPI.currentServer.getRecipeManager(); } - //?} + *///?} //? if >=1.21.2 { - /*private static final Set> recipeTypesToSync = new HashSet<>(); - private static Map,Map>> recipesByType = Collections.emptyMap(); + private static final Set> recipeTypesToSync = new HashSet<>(); + private static Map,Map>> recipesByType = Collections.emptyMap(); public static void updateRecipes(RecipeManager manager){ - recipesByType = manager.getRecipes().stream().collect(Collectors.groupingBy(h->h.value().getType(),Collectors.toMap(h->h.id()./^? if <1.21.11 {^/location/^?} else {^//^identifier^//^?}^/(), Function.identity()))); + recipesByType = manager.getRecipes().stream().collect(Collectors.groupingBy(h->h.value().getType(),Collectors.toMap(h->h.id()./*? if <1.21.11 {*//*location*//*?} else {*/identifier/*?}*/(), Function.identity()))); for (RecipeType recipeType : recipeTypesToSync) { ClientPayload.getInstance().syncRecipeTypes.put(recipeType, recipesByType.get(recipeType)); } @@ -79,7 +79,7 @@ public static void addRecipeTypeToSync(RecipeType recipeType){ recipeTypesToSync.add(recipeType); } - public record ClientPayload(Map,Map>> syncRecipeTypes) implements CommonNetwork.Payload { + public record ClientPayload(Map,Map>> syncRecipeTypes) implements CommonNetwork.Payload { public static final CommonNetwork.Identifier ID = CommonNetwork.Identifier.create(FactoryAPI.createModLocation("send_client_recipes"), ClientPayload::new); private static final ClientPayload instance = new ClientPayload(new HashMap<>()); @@ -88,7 +88,7 @@ public static ClientPayload getInstance(){ } public ClientPayload(CommonNetwork.PlayBuf buf){ - this(buf.get().readMap(b->b.readById(BuiltInRegistries.RECIPE_TYPE::byId), b->b.readMap(FriendlyByteBuf::readResourceLocation, b1->RecipeHolder.STREAM_CODEC.decode(buf.get())))); + this(buf.get().readMap(b->b.readById(BuiltInRegistries.RECIPE_TYPE::byId), b->b.readMap(FriendlyByteBuf::readIdentifier, b1->RecipeHolder.STREAM_CODEC.decode(buf.get())))); } @Override @@ -103,8 +103,8 @@ public CommonNetwork.Identifier identifier() { @Override public void encode(CommonNetwork.PlayBuf buf) { - buf.get().writeMap(syncRecipeTypes, (b,t)-> b.writeById(BuiltInRegistries.RECIPE_TYPE::getId,t),(b,t)-> b.writeMap(t,FriendlyByteBuf::writeResourceLocation,(b1,h)->RecipeHolder.STREAM_CODEC.encode(buf.get(),h))); + buf.get().writeMap(syncRecipeTypes, (b,t)-> b.writeById(BuiltInRegistries.RECIPE_TYPE::getId,t),(b,t)-> b.writeMap(t,FriendlyByteBuf::writeIdentifier,(b1,h)->RecipeHolder.STREAM_CODEC.encode(buf.get(),h))); } } - *///?} + //?} } diff --git a/src/main/java/wily/factoryapi/base/network/FactoryAPICommand.java b/src/main/java/wily/factoryapi/base/network/FactoryAPICommand.java index 677d43d..d05d5a0 100644 --- a/src/main/java/wily/factoryapi/base/network/FactoryAPICommand.java +++ b/src/main/java/wily/factoryapi/base/network/FactoryAPICommand.java @@ -13,15 +13,15 @@ import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.CompoundTagArgument; import net.minecraft.commands.arguments.EntityArgument; -import net.minecraft.commands.arguments.ResourceLocationArgument; +import net.minecraft.commands.arguments.IdentifierArgument; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtOps; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; //? if >=1.21.11 { -/*import net.minecraft.server.permissions.Permission; +import net.minecraft.server.permissions.Permission; import net.minecraft.server.permissions.PermissionLevel; -*///?} +//?} import net.minecraft.world.entity.player.Player; import wily.factoryapi.FactoryAPI; import wily.factoryapi.FactoryAPIClient; @@ -74,14 +74,14 @@ public Collection getExamples() { } public static void register(CommandDispatcher commandDispatcher, CommandBuildContext commandBuildContext) { - var command = Commands.literal("factoryapi").requires(commandSourceStack -> commandSourceStack/*? if >=1.21.11 {*//*.permissions()*//*?}*/.hasPermission(/*? if >=1.21.11 {*//*new Permission.HasCommandLevel(PermissionLevel.GAMEMASTERS)*//*?} else {*/2/*?}*/)); + var command = Commands.literal("factoryapi").requires(commandSourceStack -> commandSourceStack/*? if >=1.21.11 {*/.permissions()/*?}*/.hasPermission(/*? if >=1.21.11 {*/new Permission.HasCommandLevel(PermissionLevel.GAMEMASTERS)/*?} else {*//*2*//*?}*/)); command.then(Commands.literal("display").then(Commands.literal("ui_definition").then(Commands.argument("targets", EntityArgument.players()).then(Commands.argument("ui_definition", CompoundTagArgument.compoundTag()).executes(context -> { CommonNetwork.sendToPlayers(EntityArgument.getPlayers(context, "targets"), new UIDefinitionPayload(Optional.empty(), CompoundTagArgument.getCompoundTag(context, "ui_definition"))); return 0; - }).then(Commands.argument("default_screen", ResourceLocationArgument.id()).executes(context -> { - CommonNetwork.sendToPlayers(EntityArgument.getPlayers(context, "targets"), new UIDefinitionPayload(Optional.of(ResourceLocationArgument.getId(context, "default_screen")), CompoundTagArgument.getCompoundTag(context, "ui_definition"))); + }).then(Commands.argument("default_screen", IdentifierArgument.id()).executes(context -> { + CommonNetwork.sendToPlayers(EntityArgument.getPlayers(context, "targets"), new UIDefinitionPayload(Optional.of(IdentifierArgument.getId(context, "default_screen")), CompoundTagArgument.getCompoundTag(context, "ui_definition"))); return 0; })))))); @@ -106,7 +106,7 @@ public static void register(CommandDispatcher commandDispatc commandDispatcher.register(command); } - public record UIDefinitionPayload(Optional defaultScreen, CompoundTag uiDefinitionNbt) implements CommonNetwork.Payload { + public record UIDefinitionPayload(Optional defaultScreen, CompoundTag uiDefinitionNbt) implements CommonNetwork.Payload { public static final CommonNetwork.Identifier ID = CommonNetwork.Identifier.create(FactoryAPI.createModLocation("ui_definition_s2c"),UIDefinitionPayload::decode); @Override @@ -114,11 +114,11 @@ public void apply(Context context) { context.executor().execute(()-> FactoryAPIClient.uiDefinitionManager.openDefaultScreenAndAddDefinition(defaultScreen, UIDefinitionManager.fromDynamic(ID.toString(), new Dynamic<>(NbtOps.INSTANCE, uiDefinitionNbt)))); } public static UIDefinitionPayload decode(CommonNetwork.PlayBuf buf) { - return new UIDefinitionPayload(buf.get().readOptional(FriendlyByteBuf::readResourceLocation), buf.get().readNbt()); + return new UIDefinitionPayload(buf.get().readOptional(FriendlyByteBuf::readIdentifier), buf.get().readNbt()); } @Override public void encode(CommonNetwork.PlayBuf buf) { - buf.get().writeOptional(defaultScreen, FriendlyByteBuf::writeResourceLocation); + buf.get().writeOptional(defaultScreen, FriendlyByteBuf::writeIdentifier); buf.get().writeNbt(uiDefinitionNbt); } diff --git a/src/main/java/wily/factoryapi/base/network/HelloPayload.java b/src/main/java/wily/factoryapi/base/network/HelloPayload.java index 40eec33..9cccaa4 100644 --- a/src/main/java/wily/factoryapi/base/network/HelloPayload.java +++ b/src/main/java/wily/factoryapi/base/network/HelloPayload.java @@ -43,8 +43,8 @@ public static void sendInitialPayloads(ServerPlayer serverPlayer){ CommonNetwork.sendToPlayer(serverPlayer, new HelloPayload(FactoryAPIPlatform.getVisibleModsStream().map(ModInfo::getId).collect(Collectors.toSet()), HelloPayload.ID_S2C), true); FactoryConfig.COMMON_STORAGES.values().forEach(handler -> CommonNetwork.sendToPlayer(serverPlayer, CommonConfigSyncPayload.of(CommonConfigSyncPayload.ID_S2C, handler))); //? if >=1.21.2 { - /*CommonNetwork.sendToPlayer(serverPlayer, CommonRecipeManager.ClientPayload.getInstance(), true); - *///?} + CommonNetwork.sendToPlayer(serverPlayer, CommonRecipeManager.ClientPayload.getInstance(), true); + //?} } @Override diff --git a/src/main/java/wily/factoryapi/init/FactoryRegistries.java b/src/main/java/wily/factoryapi/init/FactoryRegistries.java index 3930369..11c9b67 100644 --- a/src/main/java/wily/factoryapi/init/FactoryRegistries.java +++ b/src/main/java/wily/factoryapi/init/FactoryRegistries.java @@ -3,10 +3,10 @@ import net.minecraft.commands.synchronization.ArgumentTypeInfo; import net.minecraft.commands.synchronization.SingletonArgumentInfo; //? if >=1.20.5 { -/*import net.minecraft.core.component.DataComponentType; +import net.minecraft.core.component.DataComponentType; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.util.ExtraCodecs; -*///?} +//?} import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.item.Item; import wily.factoryapi.FactoryAPI; @@ -24,7 +24,7 @@ public class FactoryRegistries { public static final RegisterListing.Holder> JSON_ARGUMENT_TYPE = ARGUMENT_TYPE_INFOS.add("json_argument_type",()-> SingletonArgumentInfo.contextFree(FactoryAPICommand.JsonArgument::json)); //? if >=1.20.5 { - /*public static final RegisterListing> DATA_COMPONENT_TYPES = FactoryAPIPlatform.createRegister(FactoryAPI.MOD_ID, BuiltInRegistries.DATA_COMPONENT_TYPE); + public static final RegisterListing> DATA_COMPONENT_TYPES = FactoryAPIPlatform.createRegister(FactoryAPI.MOD_ID, BuiltInRegistries.DATA_COMPONENT_TYPE); public static final RegisterListing.Holder> FLUID_INSTANCE_COMPONENT = DATA_COMPONENT_TYPES.add("fluid_instance",()-> DataComponentType.builder().persistent(FluidInstance.CODEC).networkSynchronized(FluidInstance.STREAM_CODEC).build()); public static final RegisterListing.Holder> FLUID_CAPACITY_COMPONENT = DATA_COMPONENT_TYPES.add("fluid_capacity",()-> DataComponentType.builder().persistent(ExtraCodecs.POSITIVE_INT).networkSynchronized(ByteBufCodecs.VAR_INT).build()); public static final RegisterListing.Holder> ENERGY_COMPONENT = DATA_COMPONENT_TYPES.add("energy",()-> DataComponentType.builder().persistent(ExtraCodecs.POSITIVE_INT).networkSynchronized(ByteBufCodecs.VAR_INT).build()); @@ -34,12 +34,12 @@ public class FactoryRegistries { public static final RegisterListing.Holder>> ITEM_COMPONENTS_COMPONENT = DATA_COMPONENT_TYPES.add("item_components",()-> DataComponentType.>builder().persistent(FactoryItemUtil.ITEM_COMPONENTS_CODEC).networkSynchronized(FactoryItemUtil.ITEM_COMPONENTS_STREAM_CODEC).build()); - *///?} + //?} public static void init() { ARGUMENT_TYPE_INFOS.register(); //? if >=1.20.5 { - /*DATA_COMPONENT_TYPES.register(); - *///?} + DATA_COMPONENT_TYPES.register(); + //?} } } diff --git a/src/main/java/wily/factoryapi/mixin/base/AbstractButtonMixin.java b/src/main/java/wily/factoryapi/mixin/base/AbstractButtonMixin.java index ef74a46..34ca226 100644 --- a/src/main/java/wily/factoryapi/mixin/base/AbstractButtonMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/AbstractButtonMixin.java @@ -1,22 +1,22 @@ package wily.factoryapi.mixin.base; //? if >=1.21.11 { -/*import net.minecraft.client.gui.ActiveTextCollector; +import net.minecraft.client.gui.ActiveTextCollector; import wily.factoryapi.base.FactoryRenderingTextCollector; -*///?} else { -import net.minecraft.client.gui.Font; -//?} +//?} else { +/*import net.minecraft.client.gui.Font; +*///?} import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.screens.inventory.LoomScreen; //? if >=1.21.9 { -/*import net.minecraft.client.input.KeyEvent; +import net.minecraft.client.input.KeyEvent; import net.minecraft.client.input.MouseButtonEvent; -*///?} +//?} import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -34,7 +34,7 @@ public AbstractButtonMixin(int i, int j, int k, int l, Component component) { } //? if >=1.21.9 { - /*@Inject(method = "onClick", at = @At("HEAD"), cancellable = true) + @Inject(method = "onClick", at = @At("HEAD"), cancellable = true) public void onClick(MouseButtonEvent mouseButtonEvent, boolean bl, CallbackInfo ci) { if (getOnPressOverride() != null) { super.onClick(mouseButtonEvent, bl); @@ -49,8 +49,8 @@ public void keyPressed(KeyEvent keyEvent, CallbackInfoReturnable cir) { cir.setReturnValue(true); } } - *///?} else { - @Inject(method = "onClick", at = @At("HEAD"), cancellable = true) + //?} else { + /*@Inject(method = "onClick", at = @At("HEAD"), cancellable = true) public void onClick(double d, double e, CallbackInfo ci) { if (getOnPressOverride() != null) { super.onClick(d,e); @@ -65,27 +65,27 @@ public void keyPressed(int i, int j, int k, CallbackInfoReturnable cir) cir.setReturnValue(true); } } - //?} + *///?} // TODO 1.21.11 - @Inject(method = /*? if <1.21.11 {*/"renderString"/*?} else {*//*"renderDefaultLabel"*//*?}*/, at = @At("HEAD")) - public void renderString(/*? if <1.21.11 {*/GuiGraphics guiGraphics, Font font, int i, /*?} else {*//*ActiveTextCollector activeTextCollector, *//*?}*/ CallbackInfo ci) { + @Inject(method = /*? if <1.21.11 {*//*"renderString"*//*?} else {*/"renderDefaultLabel"/*?}*/, at = @At("HEAD")) + public void renderString(/*? if <1.21.11 {*//*GuiGraphics guiGraphics, Font font, int i, *//*?} else {*/ActiveTextCollector activeTextCollector, /*?}*/ CallbackInfo ci) { //? if >=1.21.11 { - /*GuiGraphics guiGraphics; + GuiGraphics guiGraphics; if (activeTextCollector instanceof FactoryRenderingTextCollector collector) guiGraphics = collector.getGuiGraphics(); else return; - *///?} - ResourceLocation sprite = getSpriteOverride(); + //?} + Identifier sprite = getSpriteOverride(); if (sprite != null) { FactoryScreenUtil.enableBlend(); //? if <1.21.6 { - FactoryGuiGraphics.of(guiGraphics).setColor(1.0f, 1.0f, 1.0f, alpha); - //?} else - //FactoryGuiGraphics.of(guiGraphics).setBlitColor(1.0f, 1.0f, 1.0f, alpha); + /*FactoryGuiGraphics.of(guiGraphics).setColor(1.0f, 1.0f, 1.0f, alpha); + *///?} else + FactoryGuiGraphics.of(guiGraphics).setBlitColor(1.0f, 1.0f, 1.0f, alpha); FactoryGuiGraphics.of(guiGraphics).blitSprite(sprite, getX(), getY(), getWidth(), getHeight()); //? if <1.21.6 { - FactoryGuiGraphics.of(guiGraphics).clearColor(); - //?} else - //FactoryGuiGraphics.of(guiGraphics).clearBlitColor(); + /*FactoryGuiGraphics.of(guiGraphics).clearColor(); + *///?} else + FactoryGuiGraphics.of(guiGraphics).clearBlitColor(); FactoryScreenUtil.disableBlend(); } } diff --git a/src/main/java/wily/factoryapi/mixin/base/AbstractWidgetMixin.java b/src/main/java/wily/factoryapi/mixin/base/AbstractWidgetMixin.java index c4ebbe0..a4b58c1 100644 --- a/src/main/java/wily/factoryapi/mixin/base/AbstractWidgetMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/AbstractWidgetMixin.java @@ -4,12 +4,12 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; //? if >=1.20.5 { -/*import net.minecraft.client.gui.components.WidgetTooltipHolder; -*///?} else { +import net.minecraft.client.gui.components.WidgetTooltipHolder; +//?} else { //?} import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.sounds.SoundManager; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -30,23 +30,23 @@ public abstract class AbstractWidgetMixin implements WidgetAccessor, GuiEventLis @Shadow public boolean visible; - @Unique ResourceLocation overrideSprite = null; - @Unique ResourceLocation highlightedOverrideSprite = null; + @Unique Identifier overrideSprite = null; + @Unique Identifier highlightedOverrideSprite = null; @Unique Consumer onPressOverride = null; @Unique ArbitrarySupplier visibility = ArbitrarySupplier.empty(); @Override - public void setSpriteOverride(ResourceLocation sprite) { + public void setSpriteOverride(Identifier sprite) { this.overrideSprite = sprite; } @Override - public void setHighlightedSpriteOverride(ResourceLocation sprite) { + public void setHighlightedSpriteOverride(Identifier sprite) { this.highlightedOverrideSprite = sprite; } @Override - public ResourceLocation getSpriteOverride() { + public Identifier getSpriteOverride() { return isHoveredOrFocused() ? highlightedOverrideSprite : overrideSprite; } @Override diff --git a/src/main/java/wily/factoryapi/mixin/base/AddExtraModelsMixin.java b/src/main/java/wily/factoryapi/mixin/base/AddExtraModelsMixin.java index 184fdff..3ec143b 100644 --- a/src/main/java/wily/factoryapi/mixin/base/AddExtraModelsMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/AddExtraModelsMixin.java @@ -5,7 +5,7 @@ import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import net.minecraft.client.renderer.block.BlockModelShaper; import net.minecraft.client.resources.model.*; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; @@ -21,18 +21,18 @@ import java.util.*; import java.util.function.Function; -@Mixin(/*? if <1.21 {*/ModelBakery/*?} else if <1.21.5 {*//*BlockStateModelLoader*//*?} else {*//*BlockStateDefinitions*//*?}*/.class) +@Mixin(/*? if <1.21 {*//*ModelBakery*//*?} else if <1.21.5 {*//*BlockStateModelLoader*//*?} else {*/BlockStateDefinitions/*?}*/.class) public abstract class AddExtraModelsMixin { //? if <1.21 { - @Shadow protected abstract void loadTopLevel(ModelResourceLocation par1); + /*@Shadow protected abstract void loadTopLevel(ModelIdentifier par1); @WrapWithCondition(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/ProfilerFiller;popPush(Ljava/lang/String;)V", ordinal = 0)) private boolean init(ProfilerFiller instance, String string){ FactoryAPIClient.extraModels.forEach((r, id)->loadTopLevel(BlockModelShaper.stateToModelLocation(r, id.blockState()))); return true; } - //?} else if <1.21.2 { - /*@Shadow protected abstract void loadBlockStateDefinitions(ResourceLocation par1, StateDefinition par2); + *///?} else if <1.21.2 { + /*@Shadow protected abstract void loadBlockStateDefinitions(Identifier par1, StateDefinition par2); @Inject(method = "loadAllBlockStates", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/ProfilerFiller;popPush(Ljava/lang/String;)V")) private void definitionLocationToBlockMapper(CallbackInfo ci){ @@ -40,13 +40,13 @@ private void definitionLocationToBlockMapper(CallbackInfo ci){ } *///?} else if <1.21.5 { /*@Inject(method = "definitionLocationToBlockMapper", at = @At("RETURN")) - private static void definitionLocationToBlockMapper(CallbackInfoReturnable>> cir, @Local Map> map){ + private static void definitionLocationToBlockMapper(CallbackInfoReturnable>> cir, @Local Map> map){ FactoryAPIClient.extraModels.forEach((r, id)-> map.put(r, id.stateDefinition())); } *///?} else { - /*@Inject(method = "definitionLocationToBlockStateMapper", at = @At("RETURN")) - private static void loadBlockStates(CallbackInfoReturnable>> cir, @Local Map> map){ + @Inject(method = "definitionLocationToBlockStateMapper", at = @At("RETURN")) + private static void loadBlockStates(CallbackInfoReturnable>> cir, @Local Map> map){ FactoryAPIClient.extraModels.forEach((r, id)-> map.put(r, id.stateDefinition())); } - *///?} + //?} } \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/mixin/base/BakedSheetGlyphAccessor.java b/src/main/java/wily/factoryapi/mixin/base/BakedSheetGlyphAccessor.java index 4e09f25..ccf13f5 100644 --- a/src/main/java/wily/factoryapi/mixin/base/BakedSheetGlyphAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/BakedSheetGlyphAccessor.java @@ -1,5 +1,5 @@ //? if >=1.21.9 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import net.minecraft.client.gui.font.glyphs.BakedSheetGlyph; import org.spongepowered.asm.mixin.Mixin; @@ -14,4 +14,4 @@ public interface BakedSheetGlyphAccessor { @Accessor("down") float getBottom(); } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/BlockEntityWithoutLevelRendererMixin.java b/src/main/java/wily/factoryapi/mixin/base/BlockEntityWithoutLevelRendererMixin.java index 815ab4c..89bc02a 100644 --- a/src/main/java/wily/factoryapi/mixin/base/BlockEntityWithoutLevelRendererMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/BlockEntityWithoutLevelRendererMixin.java @@ -1,5 +1,5 @@ //? if <1.21.4 { -package wily.factoryapi.mixin.base; +/*package wily.factoryapi.mixin.base; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -26,4 +26,4 @@ private void injectRender(ItemStack itemStack, ItemDisplayContext itemDisplayCon } } } -//?} \ No newline at end of file +*///?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/mixin/base/ClientItemMixin.java b/src/main/java/wily/factoryapi/mixin/base/ClientItemMixin.java index 4401b7b..c2af8f8 100644 --- a/src/main/java/wily/factoryapi/mixin/base/ClientItemMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/ClientItemMixin.java @@ -1,7 +1,7 @@ package wily.factoryapi.mixin.base; //? if >=1.21.2 -//import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; +import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.world.entity.EquipmentSlot; diff --git a/src/main/java/wily/factoryapi/mixin/base/EntityRenderStateMixin.java b/src/main/java/wily/factoryapi/mixin/base/EntityRenderStateMixin.java index 267fdbb..f95608e 100644 --- a/src/main/java/wily/factoryapi/mixin/base/EntityRenderStateMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/EntityRenderStateMixin.java @@ -1,5 +1,5 @@ //? if >=1.21.2 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import net.minecraft.client.renderer.entity.state.EntityRenderState; import org.spongepowered.asm.mixin.Mixin; @@ -22,4 +22,4 @@ public > T getExtension(Class extens return (T) extensions.get(extensionClass); } } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/EntityRendererMixin.java b/src/main/java/wily/factoryapi/mixin/base/EntityRendererMixin.java index 1aeca68..867b750 100644 --- a/src/main/java/wily/factoryapi/mixin/base/EntityRendererMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/EntityRendererMixin.java @@ -1,5 +1,5 @@ //? if >=1.21.2 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.state.EntityRenderState; @@ -18,4 +18,4 @@ public void extractRenderState(Entity entity, EntityRenderState entityRenderStat FactoryRenderStateExtension.Accessor.of(entityRenderState).getExtensions().forEach(e-> e.tryExtractToRenderState(entity,f)); } } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/FontAccessor.java b/src/main/java/wily/factoryapi/mixin/base/FontAccessor.java index 704ed74..bfcffb9 100644 --- a/src/main/java/wily/factoryapi/mixin/base/FontAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/FontAccessor.java @@ -4,7 +4,7 @@ import net.minecraft.client.gui.font.FontSet; import net.minecraft.client.gui.font.glyphs.BakedGlyph; import net.minecraft.network.chat.Style; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; @@ -12,12 +12,12 @@ @Mixin(Font.class) public interface FontAccessor { //? if <1.21.9 { - @Invoker("getFontSet") - FontSet getDefaultFontSet(ResourceLocation arg); + /*@Invoker("getFontSet") + FontSet getDefaultFontSet(Identifier arg); @Accessor boolean getFilterFishyGlyphs(); - //?} else { - /*@Invoker("getGlyph") + *///?} else { + @Invoker("getGlyph") BakedGlyph getBakedGlyph(int i, Style style); - *///?} + //?} } diff --git a/src/main/java/wily/factoryapi/mixin/base/FuelValuesAccessor.java b/src/main/java/wily/factoryapi/mixin/base/FuelValuesAccessor.java index 0a859fe..3ef27d5 100644 --- a/src/main/java/wily/factoryapi/mixin/base/FuelValuesAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/FuelValuesAccessor.java @@ -1,5 +1,5 @@ //? if >=1.21.2 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import it.unimi.dsi.fastutil.objects.Object2IntSortedMap; import net.minecraft.world.item.Item; @@ -12,4 +12,4 @@ public interface FuelValuesAccessor { @Accessor Object2IntSortedMap getValues(); } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/GuiGraphicsMixin.java b/src/main/java/wily/factoryapi/mixin/base/GuiGraphicsMixin.java index a65b91c..63b2f14 100644 --- a/src/main/java/wily/factoryapi/mixin/base/GuiGraphicsMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/GuiGraphicsMixin.java @@ -3,15 +3,15 @@ import com.mojang.blaze3d.systems.RenderSystem; //? if >=1.21.6 { -/*//? if >=1.21.11 { -/^import com.mojang.blaze3d.textures.GpuSampler; -^///?} +//? if >=1.21.11 { +import com.mojang.blaze3d.textures.GpuSampler; +//?} import com.mojang.blaze3d.textures.GpuTextureView; import com.mojang.blaze3d.pipeline.RenderPipeline; import net.minecraft.client.gui.render.TextureSetup; import net.minecraft.client.gui.render.state.GuiRenderState; import net.minecraft.client.renderer.RenderPipelines; -*///?} +//?} //? if >=1.21.6 && <1.21.9 { /*import wily.factoryapi.base.client.TiledBlitRenderState; *///?} @@ -22,11 +22,11 @@ import net.minecraft.client.gui.navigation.ScreenRectangle; import net.minecraft.client.renderer.MultiBufferSource; //? if <1.21.6 { -import net.minecraft.client.renderer.RenderType; -//?} +/*import net.minecraft.client.renderer.RenderType; +*///?} import net.minecraft.client.renderer.texture.AbstractTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.Mth; import org.joml.Matrix3x2f; import org.joml.Matrix3x2fStack; @@ -49,39 +49,39 @@ @Mixin(GuiGraphics.class) public abstract class GuiGraphicsMixin implements FactoryGuiGraphics.Accessor { //? if >=1.21.2 { - /*@Unique private int blitColor = -1; + @Unique private int blitColor = -1; //? if <1.21.6 { - @Unique private Function renderingOverride = RenderType::guiTextured; - //?} else { - /^@Unique + /*@Unique private Function renderingOverride = RenderType::guiTextured; + *///?} else { + @Unique private RenderPipeline renderingOverride = RenderPipelines.GUI_TEXTURED; - ^///?} - *///?} + //?} + //?} //? if <1.21.6 { - @Mutable + /*@Mutable @Shadow @Final private MultiBufferSource.BufferSource bufferSource; @Shadow protected abstract void applyScissor(ScreenRectangle arg); - //?} + *///?} @Shadow @Final private GuiGraphics.ScissorStack scissorStack; @Shadow @Final private Minecraft minecraft; //? if >=1.21.6 { - /*@Shadow protected abstract void submitBlit(RenderPipeline par1, GpuTextureView par2, /^?if >=1.21.11 {^//^GpuSampler gpuSampler, ^//^?}^/ int par3, int par4, int par5, int par6, float par7, float par8, float par9, float par10, int par11); + @Shadow protected abstract void submitBlit(RenderPipeline par1, GpuTextureView par2, /*?if >=1.21.11 {*/GpuSampler gpuSampler, /*?}*/ int par3, int par4, int par5, int par6, float par7, float par8, float par9, float par10, int par11); @Shadow @Final public GuiRenderState guiRenderState; @Shadow public abstract Matrix3x2fStack pose(); - *///?} + //?} @Unique private MultiBufferSource.BufferSource lastBufferSource; //? if <=1.20.1 - /*@Shadow abstract void innerBlit(ResourceLocation resourceLocation, int i, int j, int k, int l, int m, float f, float g, float h, float n);*/ + /*@Shadow abstract void innerBlit(Identifier resourceLocation, int i, int j, int k, int l, int m, float f, float g, float h, float n);*/ @Unique private final FactoryGuiGraphics factoryGuiGraphics = new FactoryGuiGraphics() { @@ -108,51 +108,51 @@ public void enableDepthTest() { } @Override - public void blit(ResourceLocation texture, int x, int y, int uvX, int uvY, int width, int height) { + public void blit(Identifier texture, int x, int y, int uvX, int uvY, int width, int height) { //? if <1.21.2 { - context().blit(texture, x, y, uvX, uvY, width, height); - //?} else { - /*context().blit(renderingOverride, texture, x, y, uvX, uvY, width, height, 256, 256); - *///?} + /*context().blit(texture, x, y, uvX, uvY, width, height); + *///?} else { + context().blit(renderingOverride, texture, x, y, uvX, uvY, width, height, 256, 256); + //?} } @Override - public void blit(ResourceLocation texture, int x, int y, int z, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight) { + public void blit(Identifier texture, int x, int y, int z, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight) { //? if <1.21.2 { - context().blit(texture, x, y, z, uvX, uvY, width, height, textureWidth, textureHeight); - //?} else { - /*innerBlit(renderingOverride, texture, x, x + width, y, y + height, 0, (uvX + 0.0F) / (float)textureWidth, (uvX + (float)width) / (float)textureWidth, (uvY + 0.0F) / (float)textureHeight, (uvY + (float)height) / (float)textureHeight, blitColor); - *///?} + /*context().blit(texture, x, y, z, uvX, uvY, width, height, textureWidth, textureHeight); + *///?} else { + innerBlit(renderingOverride, texture, x, x + width, y, y + height, 0, (uvX + 0.0F) / (float)textureWidth, (uvX + (float)width) / (float)textureWidth, (uvY + 0.0F) / (float)textureHeight, (uvY + (float)height) / (float)textureHeight, blitColor); + //?} } @Override - public void blit(ResourceLocation texture, int x, int xd, int y, int yd, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight) { + public void blit(Identifier texture, int x, int xd, int y, int yd, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight) { //? if <1.21.2 { - context().blit(texture, x, xd, y, yd, uvX, uvY, width, height, textureWidth, textureHeight); - //?} else { - /*innerBlit(renderingOverride, texture, x, xd, y, yd, 0, (uvX + 0.0F) / (float)textureWidth, (uvX + (float)width) / (float)textureWidth, (uvY + 0.0F) / (float)textureHeight, (uvY + (float)height) / (float)textureHeight, blitColor); - *///?} + /*context().blit(texture, x, xd, y, yd, uvX, uvY, width, height, textureWidth, textureHeight); + *///?} else { + innerBlit(renderingOverride, texture, x, xd, y, yd, 0, (uvX + 0.0F) / (float)textureWidth, (uvX + (float)width) / (float)textureWidth, (uvY + 0.0F) / (float)textureHeight, (uvY + (float)height) / (float)textureHeight, blitColor); + //?} } @Override - public void blit(ResourceLocation texture, int x, int y, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight) { + public void blit(Identifier texture, int x, int y, float uvX, float uvY, int width, int height, int textureWidth, int textureHeight) { //? if <1.21.2 { - context().blit(texture, x, y, uvX, uvY, width, height, textureWidth, textureHeight); - //?} else - //context().blit(renderingOverride, texture, x, y, uvX, uvY, width, height, textureWidth, textureHeight); + /*context().blit(texture, x, y, uvX, uvY, width, height, textureWidth, textureHeight); + *///?} else + context().blit(renderingOverride, texture, x, y, uvX, uvY, width, height, textureWidth, textureHeight); } - public void blitSprite(ResourceLocation resourceLocation, int x, int y, int width, int height) { + public void blitSprite(Identifier resourceLocation, int x, int y, int width, int height) { //? if <1.20.2 { /*this.blitSprite(resourceLocation, x, y, 0, width, height); *///?} else if <1.21.2 { - context().blitSprite(resourceLocation, x, y, width, height); - //?} else - //context().blitSprite(renderingOverride, resourceLocation, x, y, width, height,blitColor); + /*context().blitSprite(resourceLocation, x, y, width, height); + *///?} else + context().blitSprite(renderingOverride, resourceLocation, x, y, width, height,blitColor); } - public void blitSprite(ResourceLocation resourceLocation, int x, int y, int z, int width, int height) { + public void blitSprite(Identifier resourceLocation, int x, int y, int z, int width, int height) { //? if <1.20.2 { /*TextureAtlasSprite textureAtlasSprite = FactoryGuiGraphics.getSprites().getSprite(resourceLocation); GuiSpriteScaling guiSpriteScaling = FactoryGuiGraphics.getSprites().getSpriteScaling(textureAtlasSprite); @@ -164,19 +164,19 @@ public void blitSprite(ResourceLocation resourceLocation, int x, int y, int z, i this.blitNineSlicedSprite(textureAtlasSprite, nineSlice, x, y, z, width, height); } *///?} else if <1.21.2 { - context().blitSprite(resourceLocation, x, y, z, width, height); - //?} else { - /*if (z != 0) { + /*context().blitSprite(resourceLocation, x, y, z, width, height); + *///?} else { + if (z != 0) { FactoryGuiMatrixStack.of(context().pose()).pushPose(); FactoryGuiMatrixStack.of(context().pose()).translate(0, z,0); } context().blitSprite(renderingOverride, resourceLocation, x, y, width, height, blitColor); if (z != 0) FactoryGuiMatrixStack.of(context().pose()).popPose(); - *///?} + //?} } @Override - public void blitSprite(ResourceLocation resourceLocation, int textureWidth, int textureHeight, int uvX, int uvY, int x, int y, int z, int width, int height) { + public void blitSprite(Identifier resourceLocation, int textureWidth, int textureHeight, int uvX, int uvY, int x, int y, int z, int width, int height) { //? if <=1.20.1 { /*TextureAtlasSprite textureAtlasSprite = FactoryGuiGraphics.getSprites().getSprite(resourceLocation); GuiSpriteScaling guiSpriteScaling = FactoryGuiGraphics.getSprites().getSpriteScaling(textureAtlasSprite); @@ -186,15 +186,15 @@ public void blitSprite(ResourceLocation resourceLocation, int textureWidth, int this.blitSprite(textureAtlasSprite, x, y, z, width, height); } *///?} else if <1.21.2 { - context().blitSprite(resourceLocation, textureWidth, textureHeight, uvX, uvY, x, y, z, width, height); - //?} else { - /*if (z != 0) { + /*context().blitSprite(resourceLocation, textureWidth, textureHeight, uvX, uvY, x, y, z, width, height); + *///?} else { + if (z != 0) { FactoryGuiMatrixStack.of(context().pose()).pushPose(); FactoryGuiMatrixStack.of(context().pose()).translate(0, z, 0); } context().blitSprite(renderingOverride, resourceLocation, textureWidth, textureHeight, uvX, uvY, x, y, width, height); if (z != 0) FactoryGuiMatrixStack.of(context().pose()).popPose(); - *///?} + //?} } @Override @@ -202,42 +202,42 @@ public void blit(int x, int y, int z, int width, int height, TextureAtlasSprite //? if <=1.20.1 { /*blitSprite(textureAtlasSprite, x, y, z, width, height); *///?} else if <1.21.2 { - context().blit(x, y, z, width, height, textureAtlasSprite); - //?} else { - /*if (z != 0) { + /*context().blit(x, y, z, width, height, textureAtlasSprite); + *///?} else { + if (z != 0) { FactoryGuiMatrixStack.of(context().pose()).pushPose(); FactoryGuiMatrixStack.of(context().pose()).translate(0,z,0); } context().blitSprite(renderingOverride, textureAtlasSprite, x, y, width, height); if (z != 0) FactoryGuiMatrixStack.of(context().pose()).popPose(); - *///?} + //?} } @Override public void enableScissor(int x, int y, int xd, int yd, boolean matrixAffects) { //? if <1.21.4 { - if (matrixAffects) { + /*if (matrixAffects) { Matrix4f matrix4f = FactoryGuiMatrixStack.of(context().pose()).getNative().last().pose(); Vector3f vector3f = matrix4f.transformPosition(x, y, 0.0F, new Vector3f()); Vector3f vector3f2 = matrix4f.transformPosition(xd, yd, 0.0F, new Vector3f()); applyScissor(scissorStack.push(new ScreenRectangle(Mth.floor(vector3f.x), Mth.floor(vector3f.y), Mth.floor(vector3f2.x - vector3f.x), Mth.floor(vector3f2.y - vector3f.y)))); } else context().enableScissor(x, y, xd, yd); - //?} else { + *///?} else { - /*if (matrixAffects) { + if (matrixAffects) { context().enableScissor(x, y, xd, yd); } else { //? if <1.21.6 { - applyScissor(scissorStack.push(new ScreenRectangle(x, y, xd - x, yd - y))); - //?} else { - /^scissorStack.push(new ScreenRectangle(x, y, xd - x, yd - y)); - ^///?} + /*applyScissor(scissorStack.push(new ScreenRectangle(x, y, xd - x, yd - y))); + *///?} else { + scissorStack.push(new ScreenRectangle(x, y, xd - x, yd - y)); + //?} } - *///?} + //?} } //? if <1.21.6 { - @Override + /*@Override public void setColor(int color, boolean changeBlend) { setColor(ColorUtil.getRed(color), ColorUtil.getGreen(color), ColorUtil.getBlue(color), ColorUtil.getAlpha(color), changeBlend); } @@ -249,25 +249,25 @@ public void setColor(float r, float g, float b, float a, boolean changeBlend) { else FactoryScreenUtil.disableBlend(); } //? if >=1.21.2 { - /*context().flush(); + context().flush(); RenderSystem.setShaderColor(r, g, b, a); - *///?} else { - context().setColor(r, g, b, a); - //?} + //?} else { + /^context().setColor(r, g, b, a); + ^///?} } @Override public float[] getColor() { //? if >=1.21.6 { - /*return new float[]{1,1,1,1}; - *///?} else { - return RenderSystem.getShaderColor(); - //?} + return new float[]{1,1,1,1}; + //?} else { + /^return RenderSystem.getShaderColor(); + ^///?} } - //?} + *///?} //? if >=1.21.2 { - /*@Override + @Override public void setBlitColor(float r, float g, float b, float a) { blitColor = ColorUtil.colorFromFloat(r,g,b,a); } @@ -281,11 +281,11 @@ public void setBlitColor(int color) { public int getBlitColor() { return blitColor; } - *///?} + //?} //? if >=1.21.2 { - /*//? if <1.21.6 { - private void innerBlit(Function function, ResourceLocation resourceLocation, int i, int j, int k, int l, int z, float f, float g, float h, float m, int n) { + //? if <1.21.6 { + /*private void innerBlit(Function function, Identifier resourceLocation, int i, int j, int k, int l, int z, float f, float g, float h, float m, int n) { RenderType renderType = function.apply(resourceLocation); Matrix4f matrix4f = FactoryGuiMatrixStack.of(context().pose()).getNative().last().pose(); VertexConsumer vertexConsumer = getBufferSource().getBuffer(renderType); @@ -295,14 +295,14 @@ private void innerBlit(Function function, Resource vertexConsumer.addVertex(matrix4f, (float)j, (float)k, z).setUv(g, h).setColor(n); getBufferSource().endBatch(renderType); } - //?} else { - /^private void innerBlit(RenderPipeline pipeline, ResourceLocation resourceLocation, int i, int j, int k, int l, int z, float f, float g, float h, float m, int n) { + *///?} else { + private void innerBlit(RenderPipeline pipeline, Identifier resourceLocation, int i, int j, int k, int l, int z, float f, float g, float h, float m, int n) { AbstractTexture texture = minecraft.getTextureManager().getTexture(resourceLocation); GpuTextureView gpuTextureView = texture.getTextureView(); - submitBlit(pipeline, gpuTextureView, /^¹?if >=1.21.11 {¹^//^¹texture.getSampler(),¹^//^¹?}¹^/ i, k, j, l, f, g, h, m, n); + submitBlit(pipeline, gpuTextureView, /*?if >=1.21.11 {*/texture.getSampler(),/*?}*/ i, k, j, l, f, g, h, m, n); } - ^///?} - *///?} + //?} + //?} //? if <=1.20.1 { /*public void blitSprite(TextureAtlasSprite textureAtlasSprite, int i, int j, int k, int l, int m, int n, int o, int p, int q) { if (p != 0 && q != 0) { @@ -319,24 +319,24 @@ public void blitSprite(TextureAtlasSprite textureAtlasSprite, int i, int j, int @Override public MultiBufferSource.BufferSource getBufferSource() { //? if >=1.21.6 { - /*return null; - *///?} else { - return bufferSource; - //?} + return null; + //?} else { + /*return bufferSource; + *///?} } @Override public void pushBufferSource(MultiBufferSource.BufferSource newBufferSource) { //? if <1.21.6 { - lastBufferSource = bufferSource; + /*lastBufferSource = bufferSource; bufferSource = newBufferSource; - //?} + *///?} } @Override public void popBufferSource() { //? if <1.21.6 { - if (lastBufferSource != null) bufferSource = lastBufferSource; - //?} + /*if (lastBufferSource != null) bufferSource = lastBufferSource; + *///?} } @Override @@ -351,12 +351,12 @@ public FactoryGuiGraphics getFactoryGuiGraphics() { //? if >=1.21.2 { - /*//? if <1.21.6 { - @ModifyArg(method = "blitSprite(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIII)V"), index = 10) + //? if <1.21.6 { + /*@ModifyArg(method = "blitSprite(Ljava/util/function/Function;Lnet/minecraft/resources/Identifier;IIIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIII)V"), index = 10) public int blitBlitCustom(int par3){ return blitColor; } - @ModifyArg(method = "blitSprite(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIII)V"), index = 6) + @ModifyArg(method = "blitSprite(Ljava/util/function/Function;Lnet/minecraft/resources/Identifier;IIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Ljava/util/function/Function;Lnet/minecraft/resources/Identifier;IIIII)V"), index = 6) public int blitSprite(int par3){ return blitColor; } @@ -364,16 +364,16 @@ public int blitSprite(int par3){ public int blitSpriteAtlas(int par3){ return blitColor; } - @ModifyArg(method = "blit(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIIII)V"), index = 12) + @ModifyArg(method = "blit(Ljava/util/function/Function;Lnet/minecraft/resources/Identifier;IIFFIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Ljava/util/function/Function;Lnet/minecraft/resources/Identifier;IIFFIIIIIII)V"), index = 12) public int blit(int par3){ return blitColor; } - //?} else { - /^@ModifyArg(method = "blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIIIIII)V"), index = 10) + *///?} else { + @ModifyArg(method = "blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIIIIIIII)V"), index = 10) public int blitBlitCustom(int par3){ return blitColor; } - @ModifyArg(method = "blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIII)V"), index = 6) + @ModifyArg(method = "blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIIII)V"), index = 6) public int blitSprite(int par3){ return blitColor; } @@ -381,12 +381,12 @@ public int blitSprite(int par3){ public int blitSpriteAtlas(int par3){ return blitColor; } - @ModifyArg(method = "blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIIII)V"), index = 12) + @ModifyArg(method = "blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIFFIIIIII)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIFFIIIIIII)V"), index = 12) public int blit(int par3){ return blitColor; } - ^///?} - *///?} + //?} + //?} //? if >=1.21.6 && <1.21.9 { /*@Inject(method = "blitTiledSprite", at = @At("HEAD"), cancellable = true) @@ -422,10 +422,10 @@ public void blitTiledSprite(RenderPipeline renderPipeline, TextureAtlasSprite te //? if >1.20.1 && <1.21.2 { - @Inject(method = "blitTiledSprite", at = @At("HEAD"), cancellable = true) + /*@Inject(method = "blitTiledSprite", at = @At("HEAD"), cancellable = true) public void blitTiledSprite(TextureAtlasSprite textureAtlasSprite, int i, int j, int k, int l, int m, int n, int o, int p, int q, int r, int s, CallbackInfo ci) { getFactoryGuiGraphics().blitTiledSprite(textureAtlasSprite, i, j, k, l, m, n, o, p, q, r, s); ci.cancel(); } - //?} + *///?} } diff --git a/src/main/java/wily/factoryapi/mixin/base/GuiMixin.java b/src/main/java/wily/factoryapi/mixin/base/GuiMixin.java index 73e0170..fc1f348 100644 --- a/src/main/java/wily/factoryapi/mixin/base/GuiMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/GuiMixin.java @@ -10,11 +10,11 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.components.spectator.SpectatorGui; //? if >=1.21.6 { -/*import net.minecraft.client.gui.contextualbar.ContextualBarRenderer; +import net.minecraft.client.gui.contextualbar.ContextualBarRenderer; import net.minecraft.client.gui.contextualbar.ExperienceBarRenderer; import net.minecraft.client.gui.contextualbar.JumpableVehicleBarRenderer; import net.minecraft.client.gui.contextualbar.LocatorBarRenderer; -*///?} +//?} import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -40,8 +40,8 @@ import wily.factoryapi.util.FactoryGuiElement; import wily.factoryapi.util.VariablesMap; //? if >=1.21 { -/*import net.minecraft.client.DeltaTracker; -*///?} +import net.minecraft.client.DeltaTracker; +//?} import java.util.*; @@ -130,30 +130,30 @@ public void renderVignetteReturn(GuiGraphics guiGraphics, Entity entity, Callbac } @Inject(method = "renderCrosshair", at = @At("HEAD"), cancellable = true) - public void renderCrosshair(GuiGraphics guiGraphics/*? if >=1.21 {*//*, DeltaTracker deltaTracker*//*?}*/, CallbackInfo ci) { + public void renderCrosshair(GuiGraphics guiGraphics/*? if >=1.21 {*/, DeltaTracker deltaTracker/*?}*/, CallbackInfo ci) { FactoryGuiElement.CROSSHAIR.prepareMixin(guiGraphics, this, ci); } @Inject(method = "renderCrosshair", at = @At("RETURN")) - public void renderCrosshairReturn(GuiGraphics guiGraphics/*? if >=1.21 {*//*, DeltaTracker deltaTracker*//*?}*/, CallbackInfo ci) { + public void renderCrosshairReturn(GuiGraphics guiGraphics/*? if >=1.21 {*/, DeltaTracker deltaTracker/*?}*/, CallbackInfo ci) { FactoryGuiElement.CROSSHAIR.finalizeMixin(guiGraphics, this); } @Inject(method = "renderEffects", at = @At("HEAD"), cancellable = true) - public void renderEffects(GuiGraphics guiGraphics/*? if >=1.21 {*//*, DeltaTracker deltaTracker*//*?}*/, CallbackInfo ci) { + public void renderEffects(GuiGraphics guiGraphics/*? if >=1.21 {*/, DeltaTracker deltaTracker/*?}*/, CallbackInfo ci) { FactoryGuiElement.EFFECTS.prepareMixin(guiGraphics, this, ci); } @Inject(method = "renderEffects", at = @At("RETURN")) - public void renderEffectsReturn(GuiGraphics guiGraphics/*? if >=1.21 {*//*, DeltaTracker deltaTracker*//*?}*/, CallbackInfo ci) { + public void renderEffectsReturn(GuiGraphics guiGraphics/*? if >=1.21 {*/, DeltaTracker deltaTracker/*?}*/, CallbackInfo ci) { FactoryGuiElement.EFFECTS.finalizeMixin(guiGraphics, this); } - @Inject(method = /*? if >=1.20.5 {*//*"renderItemHotbar"*//*?} else {*/"renderHotbar"/*?}*/, at = @At("HEAD"), cancellable = true) - public void renderHotbar(/*? if <1.20.5 {*/float f, /*?}*/GuiGraphics guiGraphics/*? if >=1.20.5 {*//*, DeltaTracker deltaTracker*//*?}*/, CallbackInfo ci) { + @Inject(method = /*? if >=1.20.5 {*/"renderItemHotbar"/*?} else {*//*"renderHotbar"*//*?}*/, at = @At("HEAD"), cancellable = true) + public void renderHotbar(/*? if <1.20.5 {*//*float f, *//*?}*/GuiGraphics guiGraphics/*? if >=1.20.5 {*/, DeltaTracker deltaTracker/*?}*/, CallbackInfo ci) { FactoryGuiElement.HOTBAR.prepareMixin(guiGraphics, this, ci); } - @Inject(method = /*? if >=1.20.5 {*//*"renderItemHotbar"*//*?} else {*/"renderHotbar"/*?}*/, at = @At("RETURN")) - public void renderHotbarReturn(/*? if <1.20.5 {*/float f, /*?}*/GuiGraphics guiGraphics/*? if >=1.21 {*//*, DeltaTracker deltaTracker*//*?}*/, CallbackInfo ci) { + @Inject(method = /*? if >=1.20.5 {*/"renderItemHotbar"/*?} else {*//*"renderHotbar"*//*?}*/, at = @At("RETURN")) + public void renderHotbarReturn(/*? if <1.20.5 {*//*float f, *//*?}*/GuiGraphics guiGraphics/*? if >=1.21 {*/, DeltaTracker deltaTracker/*?}*/, CallbackInfo ci) { FactoryGuiElement.HOTBAR.finalizeMixin(guiGraphics, this); } @Inject(method = "displayScoreboardSidebar", at = @At("HEAD"), cancellable = true) @@ -165,7 +165,7 @@ private void displayScoreboardSidebarReturn(GuiGraphics guiGraphics, Objective o FactoryGuiElement.SCOREBOARD.finalizeMixin(guiGraphics, this); } //? if >=1.20.5 { - /*@Inject(method = "renderOverlayMessage", at = @At(value = "HEAD"), cancellable = true) + @Inject(method = "renderOverlayMessage", at = @At(value = "HEAD"), cancellable = true) public void renderOverlayMessage(GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) { FactoryGuiElement.OVERLAY_MESSAGE.prepareMixin(guiGraphics, this, ci); } @@ -173,9 +173,9 @@ public void renderOverlayMessage(GuiGraphics guiGraphics, DeltaTracker deltaTrac public void renderOverlayMessageReturn(GuiGraphics guiGraphics, DeltaTracker deltaTracker, CallbackInfo ci) { FactoryGuiElement.OVERLAY_MESSAGE.finalizeMixin(guiGraphics, this); } - *///?} else if fabric { + //?} else if fabric { - @Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/Gui;overlayMessageTime:I", ordinal = 0, opcode = Opcodes.GETFIELD)) + /*@Redirect(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/Gui;overlayMessageTime:I", ordinal = 0, opcode = Opcodes.GETFIELD)) public int renderOverlayMessage(Gui instance) { if (!FactoryGuiElement.OVERLAY_MESSAGE.isVisible(this)) return 0; return overlayMessageTime; @@ -190,7 +190,7 @@ public void renderOverlayMessage(GuiGraphics guiGraphics, float f, CallbackInfo public void renderOverlayMessageReturn(GuiGraphics guiGraphics, float f, CallbackInfo ci) { FactoryGuiElement.OVERLAY_MESSAGE.finalizeMixin(guiGraphics, this); } - //?} + *///?} @Inject(method = "renderPlayerHealth", at = @At("HEAD"), cancellable = true) public void renderHealth(GuiGraphics guiGraphics, CallbackInfo ci) { FactoryGuiElement.PLAYER_HEALTH.prepareMixin(guiGraphics, this, ci); @@ -219,7 +219,7 @@ public void renderNeoForgeHealthReturn(GuiGraphics guiGraphics, CallbackInfo ci) *///?} //? if >=1.21.6 { - /*//? if !neoforge { + //? if !neoforge { @WrapOperation(method = "renderHotbarAndDecorations", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/contextualbar/ContextualBarRenderer;renderBackground(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V")) public void renderExperienceBar(ContextualBarRenderer instance, GuiGraphics graphics, DeltaTracker deltaTracker, Operation original, @Share("cli") LocalRef ci, @Share("fge") LocalRef elementLocalRef) { ci.set(new CallbackInfo("renderContextualBar", true)); @@ -241,7 +241,7 @@ public void renderExperienceBarReturn(ContextualBarRenderer instance, GuiGraphic if (factoryGuiElement != null) factoryGuiElement.finalizeMixin(graphics, this); } //?} else { - /^// Thank you so much /s + /*// Thank you so much /s @Unique final ThreadLocal ci = new ThreadLocal<>(); @Unique @@ -267,9 +267,9 @@ public void renderExperienceBarReturn(ContextualBarRenderer instance, GuiGraphic if (factoryGuiElement != null) factoryGuiElement.finalizeMixin(graphics, this); fge.remove();ci.remove(); } - ^///?} - *///?} else { - @Inject(method = "renderExperienceBar", at = @At("HEAD"), cancellable = true) + *///?} + //?} else { + /*@Inject(method = "renderExperienceBar", at = @At("HEAD"), cancellable = true) public void renderExperienceBar(GuiGraphics guiGraphics, int i, CallbackInfo ci) { FactoryGuiElement.EXPERIENCE_BAR.prepareMixin(guiGraphics, this, ci); } @@ -288,7 +288,7 @@ public void renderJumpMeter(PlayerRideableJumping playerRideableJumping, GuiGrap public void renderJumpMeterReturn(PlayerRideableJumping playerRideableJumping, GuiGraphics guiGraphics, int i, CallbackInfo ci) { FactoryGuiElement.JUMP_METER.finalizeMixin(guiGraphics, this); } - //?} + *///?} @Inject(method = /*? if forge || neoforge {*/ /*"renderSelectedItemName(Lnet/minecraft/client/gui/GuiGraphics;I)V" *//*?} else {*/"renderSelectedItemName"/*?}*/, at = @At("HEAD"), cancellable = true/*? if forge || neoforge {*//*, remap = false*//*?}*/) public void renderSelectedItemName(GuiGraphics guiGraphics, /*? if forge || neoforge {*/ /*int shift, *//*?}*/ CallbackInfo ci) { diff --git a/src/main/java/wily/factoryapi/mixin/base/IngredientMixin.java b/src/main/java/wily/factoryapi/mixin/base/IngredientMixin.java index 6cdeb79..9f01161 100644 --- a/src/main/java/wily/factoryapi/mixin/base/IngredientMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/IngredientMixin.java @@ -3,9 +3,9 @@ import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; //? if >=1.21.2 { -/*import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -*///?} +//?} import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; @@ -23,12 +23,12 @@ public abstract class IngredientMixin implements FactoryIngredient { //? if >=1.21.2 { - /*@Mutable + @Mutable @Shadow @Final public static StreamCodec> OPTIONAL_CONTENTS_STREAM_CODEC; @Unique private ItemStack[] stacks; - *///?} else - @Shadow public abstract ItemStack[] getItems(); + //?} else + //@Shadow public abstract ItemStack[] getItems(); @Override public CommonNetwork.Identifier identifier() { @@ -43,17 +43,17 @@ private Ingredient self(){ @Override public ItemStack[] getStacks() { //? if >=1.21.2 { - /*return stacks == null ? stacks = self().items()/^? if <1.21.4 {^/.stream()/^?}^/.map(ItemStack::new).toArray(ItemStack[]::new) : stacks; - *///?} else - return getItems(); + return stacks == null ? stacks = self().items()/*? if <1.21.4 {*//*.stream()*//*?}*/.map(ItemStack::new).toArray(ItemStack[]::new) : stacks; + //?} else + //return getItems(); } @Override public void encode(CommonNetwork.PlayBuf buf) { //? if >=1.20.5 { - /*Ingredient.CONTENTS_STREAM_CODEC.encode(buf.get(),(Ingredient) (Object) this); - *///?} else - ((Ingredient)(Object) this).toNetwork(buf.get()); + Ingredient.CONTENTS_STREAM_CODEC.encode(buf.get(),(Ingredient) (Object) this); + //?} else + //((Ingredient)(Object) this).toNetwork(buf.get()); } @Override diff --git a/src/main/java/wily/factoryapi/mixin/base/ItemModelsAccessor.java b/src/main/java/wily/factoryapi/mixin/base/ItemModelsAccessor.java index ac08872..cf6df06 100644 --- a/src/main/java/wily/factoryapi/mixin/base/ItemModelsAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/ItemModelsAccessor.java @@ -1,10 +1,10 @@ //? if >=1.21.4 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import com.mojang.serialization.MapCodec; import net.minecraft.client.renderer.item.ItemModel; import net.minecraft.client.renderer.item.ItemModels; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.ExtraCodecs; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -12,8 +12,8 @@ @Mixin(ItemModels.class) public interface ItemModelsAccessor { @Accessor("ID_MAPPER") - static ExtraCodecs.LateBoundIdMapper> getIdMapper() { + static ExtraCodecs.LateBoundIdMapper> getIdMapper() { return null; } } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/ItemTintSourcesAccessor.java b/src/main/java/wily/factoryapi/mixin/base/ItemTintSourcesAccessor.java index 130c74f..653ede2 100644 --- a/src/main/java/wily/factoryapi/mixin/base/ItemTintSourcesAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/ItemTintSourcesAccessor.java @@ -1,10 +1,10 @@ //? if >=1.21.4 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import com.mojang.serialization.MapCodec; import net.minecraft.client.color.item.ItemTintSource; import net.minecraft.client.color.item.ItemTintSources; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.ExtraCodecs; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -12,8 +12,8 @@ @Mixin(ItemTintSources.class) public interface ItemTintSourcesAccessor { @Accessor("ID_MAPPER") - static ExtraCodecs.LateBoundIdMapper> getIdMapper() { + static ExtraCodecs.LateBoundIdMapper> getIdMapper() { return null; } } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/MinecraftMixin.java b/src/main/java/wily/factoryapi/mixin/base/MinecraftMixin.java index 597164f..750dd1e 100644 --- a/src/main/java/wily/factoryapi/mixin/base/MinecraftMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/MinecraftMixin.java @@ -9,7 +9,7 @@ import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import com.mojang.realmsclient.client.RealmsClient; import com.mojang.realmsclient.gui.RealmsDataFetcher; -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.User; import net.minecraft.client.gui.Gui; @@ -58,11 +58,11 @@ public abstract class MinecraftMixin implements MinecraftAccessor { //?} //? if <1.21.9 { - @Shadow @Final private YggdrasilAuthenticationService authenticationService; - //?} else { - /*@Shadow @Final private Proxy proxy; + /*@Shadow @Final private YggdrasilAuthenticationService authenticationService; + *///?} else { + @Shadow @Final private Proxy proxy; @Shadow @Final private boolean offlineDeveloperMode; - *///?} + //?} @Mutable @Shadow @Final private ClientTelemetryManager telemetryManager; @@ -95,9 +95,9 @@ public void stop(CallbackInfo ci) { } //? if <1.20.5 { - @Accessor + /*@Accessor public abstract float getPausePartialTick(); - //?} + *///?} //? if <=1.20.1 { /*@Unique boolean gameLoaded = false; @@ -113,7 +113,7 @@ public boolean hasGameLoaded() { } //? if <1.21.2 { - @Inject(method = "tick",at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;wrapScreenError(Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V")) + /*@Inject(method = "tick",at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;wrapScreenError(Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V")) public void beforeScreenTick(CallbackInfo ci) { if (Minecraft.getInstance().screen == null) return; UIAccessor accessor = UIAccessor.of(Minecraft.getInstance().screen); @@ -126,8 +126,8 @@ public void afterScreenTick(CallbackInfo ci) { UIAccessor accessor = UIAccessor.of(Minecraft.getInstance().screen); Screen.wrapScreenError(accessor::afterTick, "Ticking screen after tick", Minecraft.getInstance().screen.getClass().getCanonicalName()); } - //?} else { - /*@Inject(method = "tick",at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;tick()V")) + *///?} else { + @Inject(method = "tick",at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;tick()V")) public void beforeScreenTick(CallbackInfo ci) { if (Minecraft.getInstance().screen != null) UIAccessor.of(Minecraft.getInstance().screen).beforeTick(); } @@ -136,7 +136,7 @@ public void beforeScreenTick(CallbackInfo ci) { public void afterScreenTick(CallbackInfo ci) { if (Minecraft.getInstance().screen != null) UIAccessor.of(Minecraft.getInstance().screen).afterTick(); } - *///?} + //?} @Override public boolean setUser(User user) { @@ -146,14 +146,14 @@ public boolean setUser(User user) { } this.user = splashManager.user = user; //? if >=1.21.9 { - /*MinecraftSessionService session = Minecraft.getInstance().services().sessionService(); + MinecraftSessionService session = Minecraft.getInstance().services().sessionService(); YggdrasilAuthenticationService authenticationService = this.offlineDeveloperMode ? YggdrasilAuthenticationService.createOffline(this.proxy) : new YggdrasilAuthenticationService(this.proxy); - *///?} else { - MinecraftSessionService session = Minecraft.getInstance().getMinecraftSessionService(); + //?} else { + /*MinecraftSessionService session = Minecraft.getInstance().getMinecraftSessionService(); boolean offlineDeveloperMode = user.getType() != User.Type.MSA; - //?} + *///?} //? if >=1.20.3 { this.profileFuture = CompletableFuture.supplyAsync(() -> session.fetchProfile(user.getProfileId(), true), Util.nonCriticalIoPool()); this.userApiService = offlineDeveloperMode ? UserApiService.OFFLINE : authenticationService.createUserApiService(user.getAccessToken()); @@ -177,7 +177,7 @@ public boolean setUser(User user) { this.profileKeyPairManager = ProfileKeyPairManager.create(userApiService, user, Minecraft.getInstance().gameDirectory.toPath()); this.telemetryManager = new ClientTelemetryManager(Minecraft.getInstance(), userApiService, user); this.reportingContext = ReportingContext.create(ReportEnvironment.local(), userApiService); - this.realmsDataFetcher = new RealmsDataFetcher(/*? if >1.21.4 {*//*RealmsClient.getOrCreate()*//*?} else {*/RealmsClient.create(Minecraft.getInstance())/*?}*/); + this.realmsDataFetcher = new RealmsDataFetcher(/*? if >1.21.4 {*/RealmsClient.getOrCreate()/*?} else {*//*RealmsClient.create(Minecraft.getInstance())*//*?}*/); //? if >=1.20.3 RealmsAvailabilityAccessor.setFuture(null); return true; diff --git a/src/main/java/wily/factoryapi/mixin/base/MipmapGeneratorMixin.java b/src/main/java/wily/factoryapi/mixin/base/MipmapGeneratorMixin.java index 5fa1634..5183bb8 100644 --- a/src/main/java/wily/factoryapi/mixin/base/MipmapGeneratorMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/MipmapGeneratorMixin.java @@ -11,9 +11,9 @@ public class MipmapGeneratorMixin { // TODO 1.21.11 //? if <1.21.11 { - @Inject(method = "alphaBlend", at = @At("HEAD"), cancellable = true) + /*@Inject(method = "alphaBlend", at = @At("HEAD"), cancellable = true) private static void alphaBlend(int i, int j, int k, int l, boolean bl, CallbackInfoReturnable cir) { if (FactoryOptions.NEAREST_MIPMAP_SCALING.get()) cir.setReturnValue(l); } - //?} + *///?} } diff --git a/src/main/java/wily/factoryapi/mixin/base/MultiVariantMixin.java b/src/main/java/wily/factoryapi/mixin/base/MultiVariantMixin.java index 7f6c240..0288357 100644 --- a/src/main/java/wily/factoryapi/mixin/base/MultiVariantMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/MultiVariantMixin.java @@ -1,16 +1,16 @@ package wily.factoryapi.mixin.base; //? if <1.21.5 { -import net.minecraft.client.renderer.block.model.Variant; +/*import net.minecraft.client.renderer.block.model.Variant; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.renderer.block.model.MultiVariant; -//?} else { -/*import net.minecraft.client.resources.model.WeightedVariants; +*///?} else { +import net.minecraft.client.resources.model.WeightedVariants; import net.minecraft.util.random.WeightedList; import net.minecraft.client.renderer.block.model.BlockModelPart; import net.minecraft.client.renderer.block.model.BlockStateModel; -*///?} +//?} import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; @@ -24,10 +24,10 @@ import java.util.List; import java.util.function.Function; -@Mixin(/*? if >1.21.4 {*//*WeightedVariants*//*?} else {*/MultiVariant/*?}*/.class) +@Mixin(/*? if >1.21.4 {*/WeightedVariants/*?} else {*//*MultiVariant*//*?}*/.class) public class MultiVariantMixin { //? if <1.21.5 { - @Mutable + /*@Mutable @Shadow @Final private List variants; @Inject(method = "", at = @At("RETURN")) @@ -36,8 +36,8 @@ private void init(List list, CallbackInfo ci) { this.variants = List.of(variants.get(0)); } } - //?} else { - /*@Mutable + *///?} else { + @Mutable @Shadow @Final private WeightedList list; @Inject(method = "", at = @At("RETURN")) @@ -46,5 +46,5 @@ private void init(WeightedList weightedList, CallbackInfo ci) { this.list = WeightedList.of(list.unwrap().getFirst().value()); } } - *///?} + //?} } diff --git a/src/main/java/wily/factoryapi/mixin/base/RecipeManagerAccessor.java b/src/main/java/wily/factoryapi/mixin/base/RecipeManagerAccessor.java index 96a43e0..54caa87 100644 --- a/src/main/java/wily/factoryapi/mixin/base/RecipeManagerAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/RecipeManagerAccessor.java @@ -1,7 +1,7 @@ //? if <1.21.2 { -package wily.factoryapi.mixin.base; +/*package wily.factoryapi.mixin.base; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.crafting.*; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; @@ -12,6 +12,6 @@ @Mixin(RecipeManager.class) public interface RecipeManagerAccessor { @Invoker("byType") - > /*? if <1.20.5 {*/ Map1.20.1 {*/RecipeHolder/*?} else {*//*R*//*?}*/>/*?} else {*//*Collection>*//*?}*/ getRecipeByType(RecipeType recipeType); + > /^? if <1.20.5 {^/ /^Map1.20.1 {¹^/RecipeHolder/^¹?} else {¹^//^¹R¹^//^¹?}¹^/>^//^?} else {^/Collection>/^?}^/ getRecipeByType(RecipeType recipeType); } -//?} \ No newline at end of file +*///?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/mixin/base/RenderPipelinesAccessor.java b/src/main/java/wily/factoryapi/mixin/base/RenderPipelinesAccessor.java index 43d05e9..a879e38 100644 --- a/src/main/java/wily/factoryapi/mixin/base/RenderPipelinesAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/RenderPipelinesAccessor.java @@ -1,5 +1,5 @@ //? if >=1.21.5 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import com.mojang.blaze3d.pipeline.RenderPipeline; import net.minecraft.client.renderer.RenderPipelines; @@ -13,4 +13,4 @@ static RenderPipeline register(RenderPipeline renderPipeline) { return renderPipeline; } } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/RenderingTextCollectorMixin.java b/src/main/java/wily/factoryapi/mixin/base/RenderingTextCollectorMixin.java index 13ec42d..7759e58 100644 --- a/src/main/java/wily/factoryapi/mixin/base/RenderingTextCollectorMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/RenderingTextCollectorMixin.java @@ -1,5 +1,5 @@ //? if >=1.21.11 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import net.minecraft.client.gui.GuiGraphics; import org.spongepowered.asm.mixin.Mixin; @@ -9,10 +9,10 @@ @Mixin(targets = "net/minecraft/client/gui/GuiGraphics$RenderingTextCollector") public class RenderingTextCollectorMixin implements FactoryRenderingTextCollector { @Shadow - private GuiGraphics field_63856; + private GuiGraphics this$0; @Override public GuiGraphics getGuiGraphics() { - return field_63856; + return this$0; } } -*///?} \ No newline at end of file +//?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/mixin/base/ScreenAccessor.java b/src/main/java/wily/factoryapi/mixin/base/ScreenAccessor.java index 113494d..98a3b4c 100644 --- a/src/main/java/wily/factoryapi/mixin/base/ScreenAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/ScreenAccessor.java @@ -1,5 +1,5 @@ //? if >=1.21.11 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; @@ -15,4 +15,4 @@ static void callDefaultHandleGameClickEvent(ClickEvent clickEvent, Minecraft min throw new UnsupportedOperationException(); } } -*///?} \ No newline at end of file +//?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/mixin/base/ScreenMixin.java b/src/main/java/wily/factoryapi/mixin/base/ScreenMixin.java index 81210bb..9022dd2 100644 --- a/src/main/java/wily/factoryapi/mixin/base/ScreenMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/ScreenMixin.java @@ -48,7 +48,7 @@ public VariablesMap> getElements() { return elements; } - private static final @Unique String INIT_METHOD = /*? >=1.21.11 {*//*"init(II)V"*//*?} else {*/"init(Lnet/minecraft/client/Minecraft;II)V"/*?}*/; + private static final @Unique String INIT_METHOD = /*? >=1.21.11 {*/"init(II)V"/*?} else {*//*"init(Lnet/minecraft/client/Minecraft;II)V"*//*?}*/; @Inject(method = INIT_METHOD, at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;init()V")) public void beforeInit(CallbackInfo ci) { diff --git a/src/main/java/wily/factoryapi/mixin/base/ServerPlayerMixin.java b/src/main/java/wily/factoryapi/mixin/base/ServerPlayerMixin.java index f5b2462..47177a8 100644 --- a/src/main/java/wily/factoryapi/mixin/base/ServerPlayerMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/ServerPlayerMixin.java @@ -20,7 +20,7 @@ public abstract class ServerPlayerMixin extends Player implements FactoryExtraMenuSupplier.PrepareMenu { public ServerPlayerMixin(Level level, BlockPos blockPos, float f, GameProfile gameProfile) { - super(level, /*? if <1.21.6 {*/ blockPos, f,/*?}*/ gameProfile); + super(level, /*? if <1.21.6 {*/ /*blockPos, f,*//*?}*/ gameProfile); } @Shadow protected abstract void nextContainerCounter(); diff --git a/src/main/java/wily/factoryapi/mixin/base/SpecialModelRenderersAccessor.java b/src/main/java/wily/factoryapi/mixin/base/SpecialModelRenderersAccessor.java index ee9b916..8c7f9a8 100644 --- a/src/main/java/wily/factoryapi/mixin/base/SpecialModelRenderersAccessor.java +++ b/src/main/java/wily/factoryapi/mixin/base/SpecialModelRenderersAccessor.java @@ -1,10 +1,10 @@ //? if >=1.21.4 { -/*package wily.factoryapi.mixin.base; +package wily.factoryapi.mixin.base; import com.mojang.serialization.MapCodec; import net.minecraft.client.renderer.special.SpecialModelRenderer; import net.minecraft.client.renderer.special.SpecialModelRenderers; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.ExtraCodecs; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -12,8 +12,8 @@ @Mixin(SpecialModelRenderers.class) public interface SpecialModelRenderersAccessor { @Accessor("ID_MAPPER") - static ExtraCodecs.LateBoundIdMapper> getIdMapper() { + static ExtraCodecs.LateBoundIdMapper> getIdMapper() { return null; } } -*///?} +//?} diff --git a/src/main/java/wily/factoryapi/mixin/base/SpectatorGuiMixin.java b/src/main/java/wily/factoryapi/mixin/base/SpectatorGuiMixin.java index 8dc7815..e847d35 100644 --- a/src/main/java/wily/factoryapi/mixin/base/SpectatorGuiMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/SpectatorGuiMixin.java @@ -22,11 +22,11 @@ public void renderHotbar(GuiGraphics guiGraphics, CallbackInfo ci) { public void renderHotbarReturn(GuiGraphics guiGraphics, CallbackInfo ci) { FactoryGuiElement.SPECTATOR_HOTBAR.finalizeMixin(guiGraphics); } - @Inject(method = /*? if <1.21.6 {*/"renderTooltip"/*?} else {*//*"renderAction"*//*?}*/, at = @At("HEAD"), cancellable = true) + @Inject(method = /*? if <1.21.6 {*//*"renderTooltip"*//*?} else {*/"renderAction"/*?}*/, at = @At("HEAD"), cancellable = true) public void renderTooltip(GuiGraphics guiGraphics, CallbackInfo ci) { FactoryGuiElement.SPECTATOR_TOOLTIP.prepareMixin(guiGraphics, ci); } - @Inject(method = /*? if <1.21.6 {*/"renderTooltip"/*?} else {*//*"renderAction"*//*?}*/, at = @At("RETURN")) + @Inject(method = /*? if <1.21.6 {*//*"renderTooltip"*//*?} else {*/"renderAction"/*?}*/, at = @At("RETURN")) public void renderTooltipReturn(GuiGraphics guiGraphics, CallbackInfo ci) { FactoryGuiElement.SPECTATOR_TOOLTIP.finalizeMixin(guiGraphics); } diff --git a/src/main/java/wily/factoryapi/mixin/base/SpriteContentsMixin.java b/src/main/java/wily/factoryapi/mixin/base/SpriteContentsMixin.java index 9274d57..173afab 100644 --- a/src/main/java/wily/factoryapi/mixin/base/SpriteContentsMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/SpriteContentsMixin.java @@ -3,7 +3,7 @@ import com.mojang.blaze3d.platform.NativeImage; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.SpriteContents; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.metadata.MetadataSectionType; import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceManager; @@ -38,14 +38,14 @@ public void setMetadata(ResourceMetadata metadata) { this.metadata = metadata; } *///?} else if <1.21.9 { - @Shadow public abstract ResourceMetadata metadata(); - //?} else { - /*@Shadow public abstract Optional getAdditionalMetadata(MetadataSectionType par1); - *///?} + /*@Shadow public abstract ResourceMetadata metadata(); + *///?} else { + @Shadow public abstract Optional getAdditionalMetadata(MetadataSectionType par1); + //?} @Shadow NativeImage[] byMipLevel; - @Shadow public abstract ResourceLocation name(); + @Shadow public abstract Identifier name(); @Inject(method = "increaseMipLevel", at = @At("RETURN")) @@ -53,10 +53,10 @@ public void increaseMipLevel(int i, CallbackInfo ci) { if (!FactoryOptions.MANUAL_MIPMAP.get()) return; //? if >=1.21.9 { - /*MipmapMetadataSection manualMipmap = getAdditionalMetadata(MipmapMetadataSection.TYPE).orElseGet(()->MipmapMetadataSection.createFallback((SpriteContents) (Object) this, i)); - *///?} else { - MipmapMetadataSection manualMipmap = metadata().getSection(MipmapMetadataSection.TYPE).orElseGet(()->MipmapMetadataSection.createFallback((SpriteContents) (Object) this, i)); - //?} + MipmapMetadataSection manualMipmap = getAdditionalMetadata(MipmapMetadataSection.TYPE).orElseGet(()->MipmapMetadataSection.createFallback((SpriteContents) (Object) this, i)); + //?} else { + /*MipmapMetadataSection manualMipmap = metadata().getSection(MipmapMetadataSection.TYPE).orElseGet(()->MipmapMetadataSection.createFallback((SpriteContents) (Object) this, i)); + *///?} NativeImage original = byMipLevel[0]; for (Map.Entry entry : manualMipmap.levels().entrySet()) { if (entry.getKey() > i) break; diff --git a/src/main/java/wily/factoryapi/mixin/base/SpriteLoaderMixin.java b/src/main/java/wily/factoryapi/mixin/base/SpriteLoaderMixin.java index aecc802..f5a5653 100644 --- a/src/main/java/wily/factoryapi/mixin/base/SpriteLoaderMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/SpriteLoaderMixin.java @@ -7,7 +7,7 @@ import net.minecraft.client.renderer.texture.SpriteContents; import net.minecraft.client.renderer.texture.SpriteLoader; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.packs.metadata.MetadataSectionType; import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceMetadata; @@ -40,11 +40,11 @@ @Mixin(SpriteLoader.class) public class SpriteLoaderMixin { - @Shadow @Final private ResourceLocation location; + @Shadow @Final private Identifier location; //? if <=1.20.1 { /*@Inject(method = "loadSprite", at = @At("RETURN")) - private static void loadSprite(ResourceLocation resourceLocation, Resource resource, CallbackInfoReturnable cir) { + private static void loadSprite(Identifier resourceLocation, Resource resource, CallbackInfoReturnable cir) { if (cir.getReturnValue() != null) { try { ResourceMetadata metadata = resource.metadata(); @@ -60,17 +60,17 @@ public Optional getSection(MetadataSectionSerializer metadataSectionSe } } *///?} else if <1.21.9 { - @Inject(method = "loadAndStitch(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/ResourceLocation;ILjava/util/concurrent/Executor;Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture;", at = @At(value = "HEAD")) + /*@Inject(method = "loadAndStitch(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/Identifier;ILjava/util/concurrent/Executor;Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture;", at = @At(value = "HEAD")) public void loadAndStitch(CallbackInfoReturnable> cir, @Local(argsOnly = true) LocalRef>> types) { if (location.equals(FactoryAPIClient.BLOCK_ATLAS_ID)) types.set(ImmutableSet.>builder().addAll(types.get()).add(MipmapMetadataSection.TYPE).build()); } - //?} else { - /*@Inject(method = "loadAndStitch", at = @At(value = "HEAD")) + *///?} else { + @Inject(method = "loadAndStitch", at = @At(value = "HEAD")) public void loadAndStitch(CallbackInfoReturnable> cir, @Local(argsOnly = true) LocalRef>> types) { if (location.equals(FactoryAPIClient.BLOCK_ATLAS_ID)) types.set(ImmutableSet.>builder().addAll(types.get()).add(MipmapMetadataSection.TYPE).build()); } - *///?} + //?} } diff --git a/src/main/java/wily/factoryapi/mixin/base/TextureAtlasMixin.java b/src/main/java/wily/factoryapi/mixin/base/TextureAtlasMixin.java index c7f7b12..f0ef0f3 100644 --- a/src/main/java/wily/factoryapi/mixin/base/TextureAtlasMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/TextureAtlasMixin.java @@ -4,7 +4,7 @@ import net.minecraft.client.renderer.texture.SpriteLoader; import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -20,10 +20,10 @@ @Mixin(TextureAtlas.class) public class TextureAtlasMixin implements FactoryGuiGraphics.AtlasAccessor { - @Shadow private Map texturesByName; + @Shadow private Map texturesByName; //? if <=1.20.1 { /*@Shadow @Final - private ResourceLocation location; + private Identifier location; @Unique private TextureAtlasSprite missingSprite; @Inject(method="upload", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/texture/TextureAtlas;texturesByName:Ljava/util/Map;", opcode = Opcodes.PUTFIELD, shift = At.Shift.AFTER)) @@ -34,14 +34,14 @@ private void init(SpriteLoader.Preparations preparations, CallbackInfo ci){ } } @Inject(method = "getSprite", at = @At("HEAD"), cancellable = true) - public void getSprite(ResourceLocation resourceLocation, CallbackInfoReturnable cir) { + public void getSprite(Identifier resourceLocation, CallbackInfoReturnable cir) { TextureAtlasSprite textureAtlasSprite = this.texturesByName.getOrDefault(resourceLocation, this.missingSprite); if (textureAtlasSprite == null) throw new IllegalStateException("Tried to lookup sprite, but atlas is not initialized"); cir.setReturnValue(textureAtlasSprite); } *///?} @Override - public Map getTexturesByName() { + public Map getTexturesByName() { return texturesByName; } } diff --git a/src/main/java/wily/factoryapi/mixin/base/fabric/LevelChunkMixin.java b/src/main/java/wily/factoryapi/mixin/base/fabric/LevelChunkMixin.java index 1759a4a..2f0e7e5 100644 --- a/src/main/java/wily/factoryapi/mixin/base/fabric/LevelChunkMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/fabric/LevelChunkMixin.java @@ -14,10 +14,10 @@ @Mixin(value = {LevelChunk.class, ProtoChunk.class} ) public class LevelChunkMixin { //? if >=1.21.2 { - /*@Redirect(method = "setBlockState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/lighting/LightEngine;hasDifferentLightProperties(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z")) + @Redirect(method = "setBlockState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/lighting/LightEngine;hasDifferentLightProperties(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z")) public boolean setBlockState(BlockState blockState, BlockState blockState1, BlockPos blockPos){ return LightEngine.hasDifferentLightProperties(blockState,blockState1) || IFactoryBlock.getBlockLuminance(blockState, (BlockGetter) this,blockPos) != IFactoryBlock.getBlockLuminance(blockState1, (BlockGetter) this,blockPos); } - *///?} + //?} } //?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/mixin/base/fabric/LevelRendererMixin.java b/src/main/java/wily/factoryapi/mixin/base/fabric/LevelRendererMixin.java index c4ba0dc..800ed19 100644 --- a/src/main/java/wily/factoryapi/mixin/base/fabric/LevelRendererMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/fabric/LevelRendererMixin.java @@ -17,15 +17,15 @@ @Mixin(LevelRenderer.class) public class LevelRendererMixin { //? if <1.21.5 { - @ModifyExpressionValue(method = "getLightColor(Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)I", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getLightEmission()I")) + /*@ModifyExpressionValue(method = "getLightColor(Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)I", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getLightEmission()I")) private static int getLightColors(int original, @Local(argsOnly = true) BlockAndTintGetter level, @Local(argsOnly = true) BlockState state, @Local(argsOnly = true) BlockPos pos) { return state.getBlock() instanceof IFactoryBlock b ? b.getLightEmission(state, level, pos) : original; } - //?} else { - /*@ModifyExpressionValue(method = "getLightColor(Lnet/minecraft/client/renderer/LevelRenderer$BrightnessGetter;Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)I", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getLightEmission()I")) - private static int getLightColors(int original, @Local(argsOnly = true) BlockAndTintGetter level, @Local(argsOnly = true) BlockState state, @Local(argsOnly = true) BlockPos pos) { - return state.getBlock() instanceof IFactoryBlock b ? b.getLightEmission(state, level, pos) : original; - } - *///?} + *///?} else { +// @ModifyExpressionValue(method = "getLightColor(Lnet/minecraft/client/renderer/LevelRenderer$BrightnessGetter;Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)I", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getLightEmission()I")) +// private static int getLightColors(int original, @Local(argsOnly = true) BlockAndTintGetter level, @Local(argsOnly = true) BlockState state, @Local(argsOnly = true) BlockPos pos) { +// return state.getBlock() instanceof IFactoryBlock b ? b.getLightEmission(state, level, pos) : original; +// } + //?} } //?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/mixin/base/fabric/LightEngineMixin.java b/src/main/java/wily/factoryapi/mixin/base/fabric/LightEngineMixin.java index 634241c..c90c84d 100644 --- a/src/main/java/wily/factoryapi/mixin/base/fabric/LightEngineMixin.java +++ b/src/main/java/wily/factoryapi/mixin/base/fabric/LightEngineMixin.java @@ -16,12 +16,12 @@ @Mixin(LightEngine.class) public class LightEngineMixin { //? if <1.21.2 { - @Inject(method = ("hasDifferentLightProperties"), at = @At("RETURN"), cancellable = true) + /*@Inject(method = ("hasDifferentLightProperties"), at = @At("RETURN"), cancellable = true) private static void injectLuminance(BlockGetter blockGetter, BlockPos blockPos, BlockState blockState, BlockState blockState2, CallbackInfoReturnable info){ if (blockState.getBlock() instanceof IFactoryBlock || blockState2.getBlock() instanceof IFactoryBlock){ info.setReturnValue(info.getReturnValue() || IFactoryBlock.getBlockLuminance(blockState2,blockGetter,blockPos) != IFactoryBlock.getBlockLuminance(blockState,blockGetter,blockPos)); } } - //?} + *///?} } //?} \ No newline at end of file diff --git a/src/main/java/wily/factoryapi/util/CompoundTagUtil.java b/src/main/java/wily/factoryapi/util/CompoundTagUtil.java index f6f2ac8..dae89c0 100644 --- a/src/main/java/wily/factoryapi/util/CompoundTagUtil.java +++ b/src/main/java/wily/factoryapi/util/CompoundTagUtil.java @@ -8,62 +8,62 @@ public class CompoundTagUtil { public static CompoundTag getCompoundTagOrEmpty(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getCompoundOrEmpty(name)*//*?} else {*/tag.getCompound(name)/*?}*/; + return /*? if >1.21.4 {*/tag.getCompoundOrEmpty(name)/*?} else {*//*tag.getCompound(name)*//*?}*/; } public static Optional getCompoundTag(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getCompound(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getCompound(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getCompound(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getCompound(name)) : Optional.empty()*//*?}*/; } public static Optional getBoolean(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getBoolean(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getBoolean(name)): Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getBoolean(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getBoolean(name)): Optional.empty()*//*?}*/; } public static Optional getByte(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getByte(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getByte(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getByte(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getByte(name)) : Optional.empty()*//*?}*/; } public static Optional getInt(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getInt(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getInt(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getInt(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getInt(name)) : Optional.empty()*//*?}*/; } public static Optional getLong(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getLong(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getLong(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getLong(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getLong(name)) : Optional.empty()*//*?}*/; } public static Optional getFloat(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getFloat(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getFloat(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getFloat(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getFloat(name)) : Optional.empty()*//*?}*/; } public static Optional getDouble(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getDouble(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getDouble(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getDouble(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getDouble(name)) : Optional.empty()*//*?}*/; } public static Optional getByteArray(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getByteArray(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getByteArray(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getByteArray(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getByteArray(name)) : Optional.empty()*//*?}*/; } public static Optional getIntArray(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getIntArray(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getIntArray(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getIntArray(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getIntArray(name)) : Optional.empty()*//*?}*/; } public static Optional getLongArray(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getLongArray(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getLongArray(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getLongArray(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getLongArray(name)) : Optional.empty()*//*?}*/; } public static byte[] getByteArrayOrEmpty(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getByteArray(name).orElseGet(()->new byte[0])*//*?} else {*/tag.getByteArray(name)/*?}*/; + return /*? if >1.21.4 {*/tag.getByteArray(name).orElseGet(()->new byte[0])/*?} else {*//*tag.getByteArray(name)*//*?}*/; } public static int[] getIntArrayOrEmpty(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getIntArray(name).orElseGet(()->new int[0])*//*?} else {*/tag.getIntArray(name)/*?}*/; + return /*? if >1.21.4 {*/tag.getIntArray(name).orElseGet(()->new int[0])/*?} else {*//*tag.getIntArray(name)*//*?}*/; } public static long[] getLongArrayOrEmpty(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getLongArray(name).orElseGet(()->new long[0])*//*?} else {*/tag.getLongArray(name)/*?}*/; + return /*? if >1.21.4 {*/tag.getLongArray(name).orElseGet(()->new long[0])/*?} else {*//*tag.getLongArray(name)*//*?}*/; } public static Optional getString(CompoundTag tag, String name){ - return /*? if >1.21.4 {*//*tag.getString(name)*//*?} else {*/tag.contains(name) ? Optional.of(tag.getString(name)) : Optional.empty()/*?}*/; + return /*? if >1.21.4 {*/tag.getString(name)/*?} else {*//*tag.contains(name) ? Optional.of(tag.getString(name)) : Optional.empty()*//*?}*/; } } diff --git a/src/main/java/wily/factoryapi/util/DynamicUtil.java b/src/main/java/wily/factoryapi/util/DynamicUtil.java index 186ea04..eb423cf 100644 --- a/src/main/java/wily/factoryapi/util/DynamicUtil.java +++ b/src/main/java/wily/factoryapi/util/DynamicUtil.java @@ -7,17 +7,17 @@ import com.mojang.datafixers.util.Pair; import com.mojang.serialization.*; //? >1.20.5 -//import net.minecraft.core.component.DataComponentPatch; +import net.minecraft.core.component.DataComponentPatch; import com.mojang.serialization.codecs.RecordCodecBuilder; //? if >1.20.1 { import net.minecraft.network.chat.ComponentSerialization; //?} -import net.minecraft.Util; +import net.minecraft.util.Util; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.RegistryOps; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.util.ExtraCodecs; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -33,13 +33,13 @@ import java.util.Optional; public class DynamicUtil { - public static final ListMap> COMMON_ITEMS = new ListMap<>(); - public static final LoadingCache,Boolean>,ItemStack> DYNAMIC_ITEMS_CACHE = CacheBuilder.newBuilder().build(CacheLoader.from(pair-> pair.getFirst().get("item").asString().result().or(()->pair.getFirst().asString().result()).map(s->BuiltInRegistries.ITEM./*? if <1.21.2 {*/get/*?} else {*//*getValue*//*?}*/(ResourceLocation.tryParse(s)).getDefaultInstance()).map(i-> { + public static final ListMap> COMMON_ITEMS = new ListMap<>(); + public static final LoadingCache,Boolean>,ItemStack> DYNAMIC_ITEMS_CACHE = CacheBuilder.newBuilder().build(CacheLoader.from(pair-> pair.getFirst().get("item").asString().result().or(()->pair.getFirst().asString().result()).map(s->BuiltInRegistries.ITEM./*? if <1.21.2 {*//*get*//*?} else {*/getValue/*?}*/(Identifier.tryParse(s)).getDefaultInstance()).map(i-> { pair.getFirst().get("count").result().flatMap(d1-> Codec.INT.parse(d1).result()).ifPresent(i::setCount); //? if <1.20.5 { - if (pair.getSecond()) pair.getFirst().get("nbt").result().flatMap(d1-> CompoundTag.CODEC.parse(d1).result()).ifPresent(i::setTag); - //?} else - //if (pair.getSecond()) convertToRegistryIfPossible(pair.getFirst()).get("components").result().flatMap(d1->DataComponentPatch.CODEC.parse(d1).result()).ifPresent(i::applyComponents); + /*if (pair.getSecond()) pair.getFirst().get("nbt").result().flatMap(d1-> CompoundTag.CODEC.parse(d1).result()).ifPresent(i::setTag); + *///?} else + if (pair.getSecond()) convertToRegistryIfPossible(pair.getFirst()).get("components").result().flatMap(d1->DataComponentPatch.CODEC.parse(d1).result()).ifPresent(i::applyComponents); return i; }).orElse(ItemStack.EMPTY))); public static final LoadingCache,RegistryOps> REGISTRY_OPS_CACHE = CacheBuilder.newBuilder().build(CacheLoader.from(o->RegistryOps.create(o, FactoryAPIPlatform.getRegistryAccess()))); @@ -49,8 +49,8 @@ public class DynamicUtil { public static final Codec VEC2_OPTIONAL_CODEC = RecordCodecBuilder.create(i -> i.group(Codec.FLOAT.fieldOf("x").orElse(0f).forGetter(vec2 -> vec2.x), Codec.FLOAT.fieldOf("y").orElse(0f).forGetter(vec2 -> vec2.y)).apply(i, Vec2::new)); public static final Codec VEC2_CODEC = Codec.either(VEC2_OPTIONAL_CODEC, Codec.FLOAT.listOf().comapFlatMap((list) -> Util.fixedSize(list, 2).map((listx) -> new Vec2(listx.get(0), listx.get(1))), (vec3) -> List.of(vec3.x, vec3.y))).xmap(e -> e.map(v->v,v->v), Either::right); - public static final Codec COMPLETE_ITEM_CODEC = RecordCodecBuilder.create(i -> i.group(BuiltInRegistries.ITEM.holderByNameCodec().fieldOf("item").forGetter(ItemStack::getItemHolder), Codec.INT.fieldOf("count").orElse(1).forGetter(ItemStack::getCount), /*? if <1.20.5 {*/CompoundTag.CODEC.optionalFieldOf("nbt").forGetter((itemStack) -> Optional.ofNullable(itemStack.getTag()))/*?} else {*//*DataComponentPatch.CODEC.fieldOf("components").orElse(DataComponentPatch.EMPTY).forGetter(ItemStack::getComponentsPatch)*//*?}*/).apply(i, /*? if >1.20.1 {*/ItemStack::new/*?} else {*//*(item,count,nbt)->{ItemStack stack = new ItemStack(item,count); stack.setTag(nbt.orElse(null)); return stack;}*//*?}*/)); - public static final Codec ITEM_CODEC = Codec.either(BuiltInRegistries.ITEM.holderByNameCodec().xmap(ItemStack::new,ItemStack::getItemHolder), COMPLETE_ITEM_CODEC).xmap(e->e.right().orElseGet(e.left()::get), Either::right); + public static final Codec COMPLETE_ITEM_CODEC = RecordCodecBuilder.create(i -> i.group(BuiltInRegistries.ITEM.holderByNameCodec().fieldOf("item").forGetter(ItemStack::typeHolder), Codec.INT.fieldOf("count").orElse(1).forGetter(ItemStack::getCount), /*? if <1.20.5 {*//*CompoundTag.CODEC.optionalFieldOf("nbt").forGetter((itemStack) -> Optional.ofNullable(itemStack.getTag()))*//*?} else {*/DataComponentPatch.CODEC.fieldOf("components").orElse(DataComponentPatch.EMPTY).forGetter(ItemStack::getComponentsPatch)/*?}*/).apply(i, /*? if >1.20.1 {*/ItemStack::new/*?} else {*//*(item,count,nbt)->{ItemStack stack = new ItemStack(item,count); stack.setTag(nbt.orElse(null)); return stack;}*//*?}*/)); + public static final Codec ITEM_CODEC = Codec.either(BuiltInRegistries.ITEM.holderByNameCodec().xmap(ItemStack::new,ItemStack::typeHolder), COMPLETE_ITEM_CODEC).xmap(e->e.right().orElseGet(e.left()::get), Either::right); public static Codec> ITEM_WITHOUT_DATA_SUPPLIER_CODEC = Codec.of(ITEM_CODEC.xmap(ArbitrarySupplier::of,ArbitrarySupplier::get),DynamicUtil::getItemWithoutDataFromDynamic); public static Codec> ITEM_SUPPLIER_CODEC = Codec.of(ITEM_CODEC.xmap(ArbitrarySupplier::of,ArbitrarySupplier::get),DynamicUtil::getItemFromDynamic); @@ -65,7 +65,7 @@ public static DataResult,T>> getItemFromDy } public static ArbitrarySupplier getItemFromDynamic(Dynamic element, boolean allowData) { - return element.get("common_item").asString().map(s->COMMON_ITEMS.get(ResourceLocation.tryParse(s))).result().orElseGet(()-> { + return element.get("common_item").asString().map(s->COMMON_ITEMS.get(Identifier.tryParse(s))).result().orElseGet(()-> { Pair,Boolean> pair = Pair.of(element,allowData); DYNAMIC_ITEMS_CACHE.refresh(pair); return ()-> DYNAMIC_ITEMS_CACHE.getUnchecked(pair); diff --git a/src/main/java/wily/factoryapi/util/FactoryGuiElement.java b/src/main/java/wily/factoryapi/util/FactoryGuiElement.java index 64eee3e..fed2ad3 100644 --- a/src/main/java/wily/factoryapi/util/FactoryGuiElement.java +++ b/src/main/java/wily/factoryapi/util/FactoryGuiElement.java @@ -18,8 +18,8 @@ public record FactoryGuiElement(String name, boolean isHud, FactoryEvent=1.21.6 { - /*public static final FactoryGuiElement LOCATOR_BAR = new FactoryGuiElement("locator_bar"); - *///?} + public static final FactoryGuiElement LOCATOR_BAR = new FactoryGuiElement("locator_bar"); + //?} public static final FactoryGuiElement JUMP_METER = new FactoryGuiElement("jump_meter"); public static final FactoryGuiElement SELECTED_ITEM_NAME = new FactoryGuiElement("selected_item_name"); public static final FactoryGuiElement SPECTATOR_TOOLTIP = new FactoryGuiElement("spectator_tooltip"); @@ -92,9 +92,9 @@ public void finalizeRender(GuiGraphics graphics, UIAccessor accessor){ int color = getColor(accessor); FactoryGuiMatrixStack.of(graphics.pose()).popPose(); //? if >=1.21.6 { - /*if (color != -1) FactoryGuiGraphics.of(graphics).clearBlitColor(); - *///?} else - if (color != -1) FactoryGuiGraphics.of(graphics).clearColor(true); + if (color != -1) FactoryGuiGraphics.of(graphics).clearBlitColor(); + //?} else + //if (color != -1) FactoryGuiGraphics.of(graphics).clearColor(true); post.invoker.render(graphics); } diff --git a/src/main/java/wily/factoryapi/util/FactoryItemUtil.java b/src/main/java/wily/factoryapi/util/FactoryItemUtil.java index c1a1f1a..cab45ff 100644 --- a/src/main/java/wily/factoryapi/util/FactoryItemUtil.java +++ b/src/main/java/wily/factoryapi/util/FactoryItemUtil.java @@ -9,14 +9,14 @@ import net.minecraft.network.chat.Component; import net.minecraft.nbt.*; //? if >=1.20.5 { -/*import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.TypedDataComponent; -*///?} +//?} import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.enchantment.Enchantment; @@ -30,9 +30,9 @@ public class FactoryItemUtil { //? if >=1.20.5 { - /*public static final Codec> ITEM_COMPONENTS_CODEC = ResourceLocation.CODEC.xmap(r-> FactoryAPIPlatform.getRegistryValue(r,BuiltInRegistries.ITEM), BuiltInRegistries.ITEM::getKey).listOf(); + public static final Codec> ITEM_COMPONENTS_CODEC = Identifier.CODEC.xmap(r-> FactoryAPIPlatform.getRegistryValue(r,BuiltInRegistries.ITEM), BuiltInRegistries.ITEM::getKey).listOf(); public static final StreamCodec> ITEM_COMPONENTS_STREAM_CODEC = ByteBufCodecs.fromCodecWithRegistries(ITEM_COMPONENTS_CODEC); - *///?} + //?} public static CompoundTag getFromJson(JsonObject obj){ return CompoundTag.CODEC.parse(JsonOps.INSTANCE,obj).result().orElseGet(CompoundTag::new); @@ -40,20 +40,20 @@ public static CompoundTag getFromJson(JsonObject obj){ public static List getItemComponents(ItemStack itemStack){ //? if <1.20.5 { - List list = new ArrayList<>(); + /*List list = new ArrayList<>(); if (itemStack.hasTag() && !itemStack.getTag().getList("Components",8).isEmpty()) - itemStack.getTag().getList("Components",8).forEach(t->list.add(BuiltInRegistries.ITEM.get(new ResourceLocation(t.getAsString())))); + itemStack.getTag().getList("Components",8).forEach(t->list.add(BuiltInRegistries.ITEM.get(new Identifier(t.getAsString())))); return list; - //?} else { - /*return itemStack.getOrDefault(FactoryRegistries.ITEM_COMPONENTS_COMPONENT.get(),new ArrayList<>()); - *///?} + *///?} else { + return itemStack.getOrDefault(FactoryRegistries.ITEM_COMPONENTS_COMPONENT.get(),new ArrayList<>()); + //?} } public static boolean equalItems(ItemStack itemStack, ItemStack itemStack1){ //? if <1.20.5 { - return ItemStack.isSameItemSameTags(itemStack,itemStack1); - //?} else - //return ItemStack.isSameItemSameComponents(itemStack,itemStack1); + /*return ItemStack.isSameItemSameTags(itemStack,itemStack1); + *///?} else + return ItemStack.isSameItemSameComponents(itemStack,itemStack1); } public static boolean compareItems(ItemStack itemStack, ItemStack itemStack1, boolean checkCount) { @@ -66,35 +66,35 @@ public static boolean compareItems(ItemStack itemStack, ItemStack itemStack1, bo else return equalItems(itemStack, itemStack1); } else if (ItemStack.isSameItem(itemStack, itemStack1) && (!checkCount || itemStack.getCount() == itemStack1.getCount())){ //? if <1.20.5 { - return NbtUtils.compareNbt(itemStack.getTag(), itemStack1.getTag(), true); - //?} else { - /*for (TypedDataComponent component : itemStack1.getComponents()) { + /*return NbtUtils.compareNbt(itemStack.getTag(), itemStack1.getTag(), true); + *///?} else { + for (TypedDataComponent component : itemStack1.getComponents()) { if (!Objects.equals(itemStack.get(component.type()),component.value())) return false; } - *///?} + //?} } return false; } public static boolean hasCustomName(ItemStack stack){ - return /*? if <1.20.5 {*/stack.hasCustomHoverName()/*?} else {*//*stack.has(DataComponents.CUSTOM_NAME)*//*?}*/; + return /*? if <1.20.5 {*//*stack.hasCustomHoverName()*//*?} else {*/stack.has(DataComponents.CUSTOM_NAME)/*?}*/; } public static void setCustomName(ItemStack stack, Component name){ //? if <1.20.5 { - if (name == null) stack.resetHoverName(); + /*if (name == null) stack.resetHoverName(); else stack.setHoverName(name); - //?} else { - /*stack.set(DataComponents.CUSTOM_NAME,name); - *///?} + *///?} else { + stack.set(DataComponents.CUSTOM_NAME,name); + //?} } - public static int getEnchantmentLevel(ItemStack stack, /*? if >=1.21 {*/ /*ResourceKey *//*?} else {*/Enchantment/*?}*/ enchantment){ + public static int getEnchantmentLevel(ItemStack stack, /*? if >=1.21 {*/ ResourceKey /*?} else {*//*Enchantment*//*?}*/ enchantment){ return getEnchantmentLevel(stack, enchantment, FactoryAPI.currentServer.registryAccess()); } - public static int getEnchantmentLevel(ItemStack stack, /*? if >=1.21 {*/ /*ResourceKey *//*?} else {*/Enchantment/*?}*/ enchantment, RegistryAccess registryAccess){ - return /*? if <1.21 {*/EnchantmentHelper.getItemEnchantmentLevel(enchantment, stack)/*?} else {*//*FactoryAPIPlatform.getRegistryValue(registryAccess, enchantment).map(e->stack.getEnchantments().getLevel(e)).orElse(0)*//*?}*/; + public static int getEnchantmentLevel(ItemStack stack, /*? if >=1.21 {*/ ResourceKey /*?} else {*//*Enchantment*//*?}*/ enchantment, RegistryAccess registryAccess){ + return /*? if <1.21 {*//*EnchantmentHelper.getItemEnchantmentLevel(enchantment, stack)*//*?} else {*/FactoryAPIPlatform.getRegistryValue(registryAccess, enchantment).map(e->stack.getEnchantments().getLevel(e)).orElse(0)/*?}*/; } } diff --git a/src/main/java/wily/factoryapi/util/FactoryScreenUtil.java b/src/main/java/wily/factoryapi/util/FactoryScreenUtil.java index 5bdeb2a..d6a1a74 100644 --- a/src/main/java/wily/factoryapi/util/FactoryScreenUtil.java +++ b/src/main/java/wily/factoryapi/util/FactoryScreenUtil.java @@ -1,10 +1,10 @@ package wily.factoryapi.util; //? if >1.21.4 { -/*import com.mojang.blaze3d.opengl.GlStateManager; - *///?} else { -import com.mojang.blaze3d.platform.GlStateManager; -//?} +import com.mojang.blaze3d.opengl.GlStateManager; + //?} else { +/*import com.mojang.blaze3d.platform.GlStateManager; +*///?} import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; @@ -45,24 +45,24 @@ public class FactoryScreenUtil { public static void drawString(FactoryGuiMatrixStack stack, String text, int x, int y, int color, boolean shadow) { Font font = mc.font; //? if >=1.21.6 { - /*switch (stack) { + switch (stack) { case GuiGraphics graphics -> graphics.drawString(font, text, x, y, color, shadow); case PoseStack poseStack -> { MultiBufferSource.BufferSource source = mc.renderBuffers().bufferSource(); - font.drawInBatch(/^? if >=1.21.2 {^//^Component.literal(text)^//^?} else {^/ text/^?}^/, (float) x, (float) y, color, shadow, poseStack.last().pose(), source, Font.DisplayMode.NORMAL, 0, 15728880/^? if <1.21.6 {^/, font.isBidirectional()/^?}^/); + font.drawInBatch(/*? if >=1.21.2 {*/Component.literal(text)/*?} else {*/ /*text*//*?}*/, (float) x, (float) y, color, shadow, poseStack.last().pose(), source, Font.DisplayMode.NORMAL, 0, 15728880/*? if <1.21.6 {*//*, font.isBidirectional()*//*?}*/); disableDepthTest(); source.endBatch(); enableDepthTest(); } default -> throw new IllegalStateException("Unexpected value: " + stack); } - *///?} else { - MultiBufferSource.BufferSource source = mc.renderBuffers().bufferSource(); - font.drawInBatch(/*? if >=1.21.2 {*//*Component.literal(text)*//*?} else {*/ text/*?}*/, (float) x, (float) y, color, shadow, stack.getNative().last().pose(), source, Font.DisplayMode.NORMAL, 0, 15728880/*? if <1.21.6 {*/, font.isBidirectional()/*?}*/); + //?} else { + /*MultiBufferSource.BufferSource source = mc.renderBuffers().bufferSource(); + font.drawInBatch(/^? if >=1.21.2 {^/Component.literal(text)/^?} else {^/ /^text^//^?}^/, (float) x, (float) y, color, shadow, stack.getNative().last().pose(), source, Font.DisplayMode.NORMAL, 0, 15728880/^? if <1.21.6 {^//^, font.isBidirectional()^//^?}^/); disableDepthTest(); source.endBatch(); enableDepthTest(); - //?} + *///?} } public static void disableDepthTest(){ @@ -100,7 +100,7 @@ public static ScreenRectangle rect2iToRectangle(Rect2i rect){ } //? if <1.21.6 { - public static void renderGuiBlock(GuiGraphics graphics, @Nullable BlockEntity be, BlockState state, int i, int j, float scaleX, float scaleY, float rotateX, float rotateY) { + /*public static void renderGuiBlock(GuiGraphics graphics, @Nullable BlockEntity be, BlockState state, int i, int j, float scaleX, float scaleY, float rotateX, float rotateY) { Item item = state.getBlock().asItem(); graphics.pose().pushPose(); graphics.pose().translate(i + 8F, j + 8F, 250F); @@ -120,16 +120,16 @@ public static void renderGuiBlock(GuiGraphics graphics, @Nullable BlockEntity be mc.getBlockRenderer().renderSingleBlock(state, graphics.pose(), FactoryGuiGraphics.of(graphics).getBufferSource(), 15728880, OverlayTexture.NO_OVERLAY); } } else { - blockEntityRenderer.render(be, FactoryAPIClient.getGamePartialTick(true),graphics.pose(),FactoryGuiGraphics.of(graphics).getBufferSource(),15728880, OverlayTexture.NO_OVERLAY /*? if >1.21.4 {*//*, Vec3.ZERO*//*?}*/); + blockEntityRenderer.render(be, FactoryAPIClient.getGamePartialTick(true),graphics.pose(),FactoryGuiGraphics.of(graphics).getBufferSource(),15728880, OverlayTexture.NO_OVERLAY /^? if >1.21.4 {^/, Vec3.ZERO/^?}^/); } graphics.flush(); graphics.pose().popPose(); } - //?} else { - /*public static void renderGuiBlock(GuiGraphics graphics, @Nullable BlockEntity be, BlockState state, int i, int j, float scaleX, float scaleY, float rotateX, float rotateY) { + *///?} else { + public static void renderGuiBlock(GuiGraphics graphics, @Nullable BlockEntity be, BlockState state, int i, int j, float scaleX, float scaleY, float rotateX, float rotateY) { throw new IllegalStateException("Not implemented in 1.21.6+!"); } - *///?} + //?} public static void playButtonDownSound(float grave) { Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, grave)); @@ -149,9 +149,9 @@ public static void applyScale(GuiGraphics graphics, float x, float y, float z) { public static void applyColor(GuiGraphics graphics, int color) { //? if >=1.21.6 { - /*if (color != -1) FactoryGuiGraphics.of(graphics).setBlitColor(color); - *///?} else - if (color != -1) FactoryGuiGraphics.of(graphics).setColor(color, true); + if (color != -1) FactoryGuiGraphics.of(graphics).setBlitColor(color); + //?} else + //if (color != -1) FactoryGuiGraphics.of(graphics).setColor(color, true); } public static UIAccessor getScreenAccessor(){ diff --git a/src/main/java/wily/factoryapi/util/FluidInstance.java b/src/main/java/wily/factoryapi/util/FluidInstance.java index 29b1bb4..627859e 100644 --- a/src/main/java/wily/factoryapi/util/FluidInstance.java +++ b/src/main/java/wily/factoryapi/util/FluidInstance.java @@ -5,11 +5,11 @@ import com.mojang.serialization.JsonOps; import com.mojang.serialization.codecs.RecordCodecBuilder; //? if >=1.20.5 { -/*import net.minecraft.core.Holder; +import net.minecraft.core.Holder; import net.minecraft.core.component.*; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -*///?} +//?} import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; @@ -17,7 +17,7 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; import org.jetbrains.annotations.Nullable; @@ -34,18 +34,18 @@ /*import net.neoforged.neoforge.fluids.FluidStack; *///?} -public class FluidInstance /*? if >=1.20.5 && !forge {*//*implements DataComponentHolder*//*?}*/ { +public class FluidInstance /*? if >=1.20.5 && !forge {*/implements DataComponentHolder/*?}*/ { private final Fluid fluid; private int amount; //? if <1.20.5 || forge { - private CompoundTag tag; - //?} else - //private PatchedDataComponentMap components = new PatchedDataComponentMap(PatchedDataComponentMap.EMPTY); + /*private CompoundTag tag; + *///?} else + private PatchedDataComponentMap components = new PatchedDataComponentMap(PatchedDataComponentMap.EMPTY); - public static final Codec CODEC = RecordCodecBuilder.create(i-> i.group(BuiltInRegistries.FLUID.byNameCodec().fieldOf("fluid").forGetter(FluidInstance::getFluid), Codec.INT.fieldOf("amount").forGetter(FluidInstance::getAmount), /*? if <1.20.5 || forge {*/ CompoundTag/*?} else {*/ /*DataComponentPatch*//*?}*/.CODEC.fieldOf(/*? if <1.20.5 || forge {*/ "nbt"/*?} else {*/ /*"components"*//*?}*/).forGetter(FluidInstance::/*? if <1.20.5 || forge {*/ getNonNullTag/*?} else {*//*getComponentsPatch*//*?}*/)).apply(i,FluidInstance::new)); + public static final Codec CODEC = RecordCodecBuilder.create(i-> i.group(BuiltInRegistries.FLUID.byNameCodec().fieldOf("fluid").forGetter(FluidInstance::getFluid), Codec.INT.fieldOf("amount").forGetter(FluidInstance::getAmount), /*? if <1.20.5 || forge {*/ /*CompoundTag*//*?} else {*/ DataComponentPatch/*?}*/.CODEC.fieldOf(/*? if <1.20.5 || forge {*/ /*"nbt"*//*?} else {*/ "components"/*?}*/).forGetter(FluidInstance::/*? if <1.20.5 || forge {*/ /*getNonNullTag*//*?} else {*/getComponentsPatch/*?}*/)).apply(i,FluidInstance::new)); //? if >=1.20.5 - //public static final StreamCodec STREAM_CODEC = StreamCodec.of(FluidInstance::encode, FluidInstance::decode); + public static final StreamCodec STREAM_CODEC = StreamCodec.of(FluidInstance::encode, FluidInstance::decode); public static final FluidInstance EMPTY = new FluidInstance(Fluids.EMPTY,0); @@ -53,12 +53,12 @@ public FluidInstance(Fluid fluid, int amount){ this.fluid = fluid; this.amount = amount; } - public FluidInstance(Fluid fluid, int amount, /*? if <1.20.5 || forge {*/ CompoundTag tag/*?} else {*/ /*DataComponentPatch components*//*?}*/){ + public FluidInstance(Fluid fluid, int amount, /*? if <1.20.5 || forge {*/ /*CompoundTag tag*//*?} else {*/ DataComponentPatch components/*?}*/){ this(fluid,amount); //? if <1.20.5 || forge { - this.tag = tag.copy(); - //?} else - //this.components = PatchedDataComponentMap.fromPatch(DataComponentMap.builder().build(),components); + /*this.tag = tag.copy(); + *///?} else + this.components = PatchedDataComponentMap.fromPatch(DataComponentMap.builder().build(),components); } public static FluidInstance empty() { @@ -82,12 +82,12 @@ public static FluidInstance create(Fluid fluid, long amount){ } //? if <1.20.5 || forge { - public CompoundTag getNonNullTag() { + /*public CompoundTag getNonNullTag() { return getTag() == null ? new CompoundTag() : getTag(); } - //?} + *///?} //? if <1.20.5 || forge { - public CompoundTag getTag() { + /*public CompoundTag getTag() { return tag; } @@ -100,8 +100,8 @@ public CompoundTag getOrCreateTag() { setTag(new CompoundTag()); return tag; } - //?} else { - /*@Override + *///?} else { + @Override public DataComponentMap getComponents() { return components; } @@ -126,7 +126,7 @@ public void applyComponents(DataComponentMap components) { this.components.setAll(components); } - *///?} + //?} public Fluid getFluid(){ return fluid; @@ -150,7 +150,7 @@ public void setAmount(int amount){ //? if fabric { public FluidVariant toVariant(){ - return FluidVariant.of(fluid,/*? if <1.20.5 {*/ tag/*?} else {*/ /*getComponentsPatch()*//*?}*/); + return FluidVariant.of(fluid,/*? if <1.20.5 {*/ /*tag*//*?} else {*/ getComponentsPatch()/*?}*/); } //?} else if neoforge || forge { /*private FluidStack stack; @@ -232,26 +232,26 @@ public Component getName() { @Override public boolean equals(Object obj) { - return super.equals(obj) || obj instanceof FluidInstance i && i.isFluidEqual(this) && i.getAmount() == getAmount() &&/*? if <1.20.5 || forge {*/ Objects.equals(tag, i.tag) /*?} else {*//*components.equals(i.components)*//*?}*/; + return super.equals(obj) || obj instanceof FluidInstance i && i.isFluidEqual(this) && i.getAmount() == getAmount() &&/*? if <1.20.5 || forge {*/ /*Objects.equals(tag, i.tag) *//*?} else {*/components.equals(i.components)/*?}*/; } @Override public int hashCode() { - return Objects.hash(fluid, amount, /*? if <1.20.5 || forge {*/ tag /*?} else {*//*components*//*?}*/); + return Objects.hash(fluid, amount, /*? if <1.20.5 || forge {*/ /*tag *//*?} else {*/components/*?}*/); } - public static void encode( /*? if <1.20.5 {*/FriendlyByteBuf/*?} else {*//*RegistryFriendlyByteBuf *//*?}*/ buf, FluidInstance instance){ + public static void encode( /*? if <1.20.5 {*//*FriendlyByteBuf*//*?} else {*/RegistryFriendlyByteBuf /*?}*/ buf, FluidInstance instance){ buf.writeInt(instance.getAmount()); if (instance.isEmpty()) return; - buf.writeResourceLocation(BuiltInRegistries.FLUID.getKey(instance.getFluid())); + buf.writeIdentifier(BuiltInRegistries.FLUID.getKey(instance.getFluid())); //? if <1.20.5 || forge { - buf.writeNbt(instance.getNonNullTag()); - //?} else - //DataComponentPatch.STREAM_CODEC.encode(buf,instance.getComponentsPatch()); + /*buf.writeNbt(instance.getNonNullTag()); + *///?} else + DataComponentPatch.STREAM_CODEC.encode(buf,instance.getComponentsPatch()); } - public static FluidInstance decode(/*? if <1.20.5 {*/FriendlyByteBuf/*?} else {*//*RegistryFriendlyByteBuf *//*?}*/ buf){ + public static FluidInstance decode(/*? if <1.20.5 {*//*FriendlyByteBuf*//*?} else {*/RegistryFriendlyByteBuf /*?}*/ buf){ int amount = buf.readInt(); if (amount <= 0) return EMPTY; - return new FluidInstance(FactoryAPIPlatform.getRegistryValue(buf.readResourceLocation(),BuiltInRegistries.FLUID), amount, /*? if <1.20.5 || forge {*/buf.readNbt()/*?} else {*//*DataComponentPatch.STREAM_CODEC.decode(buf)*//*?}*/); + return new FluidInstance(FactoryAPIPlatform.getRegistryValue(buf.readIdentifier(),BuiltInRegistries.FLUID), amount, /*? if <1.20.5 || forge {*//*buf.readNbt()*//*?} else {*/DataComponentPatch.STREAM_CODEC.decode(buf)/*?}*/); } } diff --git a/src/main/java/wily/factoryapi/util/ProgressElementRenderUtil.java b/src/main/java/wily/factoryapi/util/ProgressElementRenderUtil.java index a68bc3a..7f54431 100644 --- a/src/main/java/wily/factoryapi/util/ProgressElementRenderUtil.java +++ b/src/main/java/wily/factoryapi/util/ProgressElementRenderUtil.java @@ -30,9 +30,9 @@ public static void renderFluidTank(GuiGraphics graphics, int x, int y, IFactoryD int posY = y + type.height() - fluidHeight; if (hasColor) { //? if <1.21.6 { - FactoryGuiGraphics.of(graphics).setColor(FluidRenderUtil.getFixedColor(instance), true); - //?} else - //FactoryGuiGraphics.of(graphics).setBlitColor(FluidRenderUtil.getFixedColor(instance)); + /*FactoryGuiGraphics.of(graphics).setColor(FluidRenderUtil.getFixedColor(instance), true); + *///?} else + FactoryGuiGraphics.of(graphics).setBlitColor(FluidRenderUtil.getFixedColor(instance)); } for (int i = 0; i < fluidWidth; i += 16) { for (int j = 0; j < fluidHeight; j += 16) { @@ -40,9 +40,9 @@ public static void renderFluidTank(GuiGraphics graphics, int x, int y, IFactoryD } } //? if <1.21.6 { - FactoryGuiGraphics.of(graphics).clearColor(true); - //?} else - //FactoryGuiGraphics.of(graphics).clearBlitColor(); + /*FactoryGuiGraphics.of(graphics).clearColor(true); + *///?} else + FactoryGuiGraphics.of(graphics).clearBlitColor(); } type.draw(graphics,x,y); } diff --git a/src/main/java/wily/factoryapi/util/StorageStringUtil.java b/src/main/java/wily/factoryapi/util/StorageStringUtil.java index fe6a027..2f55e82 100644 --- a/src/main/java/wily/factoryapi/util/StorageStringUtil.java +++ b/src/main/java/wily/factoryapi/util/StorageStringUtil.java @@ -117,7 +117,7 @@ public static boolean isKeyDown(int glfw) { if (keyCode != InputConstants.UNKNOWN.getValue()) { try { if (key.getType() == InputConstants.Type.KEYSYM) { - return InputConstants.isKeyDown(Minecraft.getInstance().getWindow()/*? if <1.21.9 {*/.getWindow()/*?}*/, keyCode); + return InputConstants.isKeyDown(Minecraft.getInstance().getWindow()/*? if <1.21.9 {*//*.getWindow()*//*?}*/, keyCode); } } catch (Exception ignored) { } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 31da121..cea1c6c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ ], "depends": { "fabric-api": ">=${fabric_api_version}", - "minecraft": ["${mc_version_range}"] + "minecraft": ["26.1-alpha.1"] }, "suggests": { "factocrafty": ">=0.0.0.6" diff --git a/src/main/resources/factory_api-261.accesswidener b/src/main/resources/factory_api-261.accesswidener new file mode 100644 index 0000000..1a87a7d --- /dev/null +++ b/src/main/resources/factory_api-261.accesswidener @@ -0,0 +1,14 @@ +accessWidener v2 official +accessible field net/minecraft/world/level/lighting/LightEngine chunkSource Lnet/minecraft/world/level/chunk/LightChunkGetter; +accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage; +accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z +accessible method net/minecraft/world/level/lighting/LightEngine enqueueIncrease (JJ)V +accessible field net/minecraft/nbt/CompoundTag tags Ljava/util/Map; +accessible class net/minecraft/client/gui/screens/MenuScreens$ScreenConstructor +extendable class net/minecraft/world/item/crafting/Ingredient +accessible method net/minecraft/world/item/crafting/Ingredient (Lnet/minecraft/core/HolderSet;)V +accessible field net/minecraft/client/resources/SplashManager user Lnet/minecraft/client/User; +mutable field net/minecraft/client/resources/SplashManager user Lnet/minecraft/client/User; +accessible class net/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier +accessible method net/minecraft/world/level/block/entity/BlockEntityType (Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;Ljava/util/Set;)V +accessible class net/minecraft/client/gui/GuiGraphics$ScissorStack \ No newline at end of file diff --git a/src/main/resources/factory_api.mixins.json5 b/src/main/resources/factory_api.mixins.json5 index b2be796..ab2178a 100644 --- a/src/main/resources/factory_api.mixins.json5 +++ b/src/main/resources/factory_api.mixins.json5 @@ -6,20 +6,20 @@ "compatibilityLevel": "JAVA_17", "client": [ //? if <1.21.4 { - "BlockEntityWithoutLevelRendererMixin", - //?} else { - /*"SpecialModelRenderersAccessor", + /*"BlockEntityWithoutLevelRendererMixin", + *///?} else { + "SpecialModelRenderersAccessor", "ItemModelsAccessor", "ItemTintSourcesAccessor", - *///?} + //?} //? if fabric { "fabric.LevelRendererMixin", "fabric.ModelBlockRendererMixin", //?} //? if >=1.21.2 { - /*"EntityRenderStateMixin", + "EntityRenderStateMixin", "EntityRendererMixin", - *///?} + //?} //? if >1.20.2 { "RealmsAvailabilityAccessor", //?} @@ -27,15 +27,15 @@ /*"forge.ForgeGuiMixin", *///?} //? if >=1.21.5 { - /*"RenderPipelinesAccessor", - *///?} + "RenderPipelinesAccessor", + //?} //? if >=1.21.9 { - /*"BakedSheetGlyphAccessor", - *///?} + "BakedSheetGlyphAccessor", + //?} //? if >=1.21.11 { - /*"ScreenAccessor", + "ScreenAccessor", "RenderingTextCollectorMixin", - *///?} + //?} "SpriteLoaderMixin", "AbstractContainerScreenMixin", "AbstractWidgetMixin", @@ -71,10 +71,10 @@ "neoforge.ItemCapabilityMixin", *///?} //? if <1.21.2 { - "RecipeManagerAccessor", - //?} else { - /*"FuelValuesAccessor", - *///?} + /*"RecipeManagerAccessor", + *///?} else { + "FuelValuesAccessor", + //?} "IngredientMixin", "MinecraftServerMixin", "PlayerListMixin", diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index e5b0920..6b15e5e 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -1,9 +1,11 @@ plugins { id("dev.kikugie.stonecutter") - id("dev.architectury.loom") version "1.13.+" apply false + //id("dev.architectury.loom") version "1.13.+" apply false + id("net.fabricmc.fabric-loom") version "1.14.+" apply false + id("net.fabricmc.fabric-loom-remap") version "1.14.+" apply false } -stonecutter active "1.20.4-fabric" /* [SC] DO NOT EDIT */ +stonecutter active "26.1-fabric" /* [SC] DO NOT EDIT */ stonecutter parameters { val loader = node.project.property("loom.platform").toString() diff --git a/versions/26.1-fabric/gradle.properties b/versions/26.1-fabric/gradle.properties new file mode 100644 index 0000000..b6238c3 --- /dev/null +++ b/versions/26.1-fabric/gradle.properties @@ -0,0 +1,6 @@ +loom.platform=fabric +fabric_loader_version=0.18.4 +fabric_api_version=0.140.3+26.1 +mc_version_range=26.1-snapshot.1 +team_reborn_energy_version=5.0.0 +modmenu_version=18.0.0-alpha.3 \ No newline at end of file