-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/feature/registry-sync-v2/main' into feature/…
…registry-sync-v2/api # Conflicts: # build.gradle
- Loading branch information
Showing
296 changed files
with
5,612 additions
and
2,119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * This file is part of SpongeAPI, licensed under the MIT License (MIT). | ||
| * | ||
| * Copyright (c) SpongePowered <https://www.spongepowered.org> | ||
| * Copyright (c) contributors | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| org.gradle.jvmargs=-Xmx3G | ||
| org.gradle.parallel=true | ||
|
|
||
| base_version = 1.9.4 | ||
| base_version = 1.10.2 | ||
| loader_version = 0.15.7 | ||
| yarn_mappings_build = 530 | ||
|
|
||
| ## Module versions | ||
| legacy-fabric-api-base.version = 1.1.0 | ||
| legacy-fabric-command-api-v1.version = 1.0.0 | ||
| legacy-fabric-command-api-v2.version = 1.0.1 | ||
| legacy-fabric-command-api-v1.version = 1.0.1 | ||
| legacy-fabric-command-api-v2.version = 1.0.2 | ||
| legacy-fabric-crash-report-info-v1.version = 1.0.0 | ||
| legacy-fabric-entity-events-v1.version = 1.0.0 | ||
| legacy-fabric-gamerule-api-v1.version = 1.0.0 | ||
| legacy-fabric-item-groups-v1.version = 2.0.0 | ||
| legacy-fabric-keybindings-api-v1.version = 1.0.1 | ||
| legacy-fabric-lifecycle-events-v1.version = 1.0.1 | ||
| legacy-fabric-item-groups-v1.version = 2.1.0 | ||
| legacy-fabric-keybindings-api-v1.version = 1.1.1 | ||
| legacy-fabric-lifecycle-events-v1.version = 1.1.0 | ||
| legacy-fabric-logger-api-v1.version = 1.0.4 | ||
| legacy-fabric-networking-api-v1.version = 2.0.1 | ||
| legacy-fabric-permissions-api-v1.version = 1.0.1 | ||
| legacy-fabric-networking-api-v1.version = 2.0.2 | ||
| legacy-fabric-permissions-api-v1.version = 1.1.0 | ||
| legacy-fabric-registry-sync-api-v1.version = 2.2.0 | ||
| legacy-fabric-registry-sync-api-v2.version = 1.0.0 | ||
| legacy-fabric-rendering-api-v1.version = 1.0.0 | ||
| legacy-fabric-resource-loader-v1.version = 2.1.1 | ||
| legacy-fabric-resource-loader-v1.version = 2.2.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| minVersionIncluded=1.3 | ||
| maxVersionIncluded=1.12.2 | ||
| artifactSuffix= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...nd-api-v1/common/src/testmod/java/net/legacyfabric/fabric/test/command/CommandV1Test.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Copyright (c) 2020 - 2024 Legacy Fabric | ||
| * Copyright (c) 2016 - 2022 FabricMC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.legacyfabric.fabric.test.command; | ||
|
|
||
| import net.fabricmc.api.ModInitializer; | ||
|
|
||
| import net.legacyfabric.fabric.api.logger.v1.Logger; | ||
| import net.legacyfabric.fabric.api.registry.CommandRegistry; | ||
|
|
||
| public class CommandV1Test implements ModInitializer { | ||
| public static final Logger LOGGER = Logger.get("LegacyFabricAPI", "Test", "CommandV1Test"); | ||
|
|
||
| @Override | ||
| public void onInitialize() { | ||
| CommandRegistry.INSTANCE.register(new ModMetadataCommandV1()); | ||
| } | ||
| } |
79 changes: 79 additions & 0 deletions
79
...v1/common/src/testmod/java/net/legacyfabric/fabric/test/command/ModMetadataCommandV1.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright (c) 2020 - 2024 Legacy Fabric | ||
| * Copyright (c) 2016 - 2022 FabricMC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.legacyfabric.fabric.test.command; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import net.minecraft.command.AbstractCommand; | ||
| import net.minecraft.command.CommandException; | ||
| import net.minecraft.command.CommandSource; | ||
|
|
||
| import net.fabricmc.loader.api.FabricLoader; | ||
| import net.fabricmc.loader.api.ModContainer; | ||
| import net.fabricmc.loader.api.metadata.ContactInformation; | ||
|
|
||
| public class ModMetadataCommandV1 extends AbstractCommand { | ||
| @Override | ||
| public String getCommandName() { | ||
| return "modmetadatav1"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getUsageTranslationKey(CommandSource source) { | ||
| return "modmetadatav1"; | ||
| } | ||
|
|
||
| @Override | ||
| public void execute(CommandSource source, String[] args) throws CommandException { | ||
| if (args.length > 0) { | ||
| Optional<ModContainer> optionalModContainer = FabricLoader.getInstance().getModContainer(args[0]); | ||
|
|
||
| if (optionalModContainer.isPresent()) { | ||
| ModContainer container = optionalModContainer.get(); | ||
|
|
||
| StringBuilder builder = new StringBuilder(); | ||
| builder.append("Mod Name: ".concat(container.getMetadata().getName()).concat("\n")); | ||
| builder.append("Description: ".concat(container.getMetadata().getDescription()).concat("\n")); | ||
| ContactInformation contact = container.getMetadata().getContact(); | ||
|
|
||
| if (contact.get("issues").isPresent()) { | ||
| StringBuilder issueText = new StringBuilder(""); | ||
| issueText.append("Issues: "); | ||
| StringBuilder issueUrl = new StringBuilder(contact.get("issues").get()); | ||
| issueText.append(issueUrl); | ||
| issueText.append("\n"); | ||
| builder.append(issueText); | ||
| } | ||
|
|
||
| if (contact.get("sources").isPresent()) { | ||
| StringBuilder sourcesText = new StringBuilder(""); | ||
| sourcesText.append("Sources: "); | ||
| StringBuilder sourcesUrl = new StringBuilder(contact.get("sources").get()); | ||
| sourcesText.append(sourcesUrl); | ||
| sourcesText.append("\n"); | ||
| builder.append(sourcesText); | ||
| } | ||
|
|
||
| builder.append("Metadata Type: ".concat(container.getMetadata().getType()).concat("\n")); | ||
| CommandV1Test.LOGGER.info(builder.toString()); | ||
| } else { | ||
| CommandV1Test.LOGGER.error("Couldn't find Mod container for mod id '" + args[0] + "'"); | ||
| } | ||
| } | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
legacy-fabric-command-api-v1/common/src/testmod/resources/fabric.mod.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "schemaVersion": 1, | ||
| "id": "legacy-fabric-command-api-v1-testmod", | ||
| "description": "Tests for api features", | ||
| "version": "1.0.0", | ||
| "entrypoints": { | ||
| "main": [ | ||
| "net.legacyfabric.fabric.test.command.CommandV1Test" | ||
| ] | ||
| }, | ||
| "depends": { | ||
| "minecraft": "${minecraft_version}" | ||
| } | ||
| } |
30 changes: 19 additions & 11 deletions
30
...12.2/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/CommandCallable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 19 additions & 11 deletions
30
...2.2/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/CommandException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 19 additions & 11 deletions
30
....12.2/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/CommandManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.