imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update to 1.19.1 (#302)"

Browse Source 
This reverts commit b316dde8ba.
This commit is contained in:
shedaniel
2022-08-06 10:05:43 +08:00
parent 6624dbe295
commit 1c98573c5f
25 changed files with 546 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge/build.gradle
View File

@@ -126,7 +126,7 @@ unifiedPublishing {
displayName = "[Forge $rootProject.supported_version] v$project.version"
releaseType = "$rootProject.artifact_type"
changelog = releaseChangelog()
gameVersions = ["1.19.1"]
gameVersions = ["1.19"]
gameLoaders = ["forge"]
mainPublication renameJarForPublication

18
forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
View File

@@ -25,6 +25,7 @@ import dev.architectury.event.EventResult;
import dev.architectury.event.events.client.ClientChatEvent;
import dev.architectury.event.events.client.*;
import dev.architectury.event.events.common.InteractionEvent;
import dev.architectury.impl.ChatProcessorImpl;
import dev.architectury.impl.ScreenAccessImpl;
import dev.architectury.impl.TooltipEventColorContextImpl;
import dev.architectury.impl.TooltipEventPositionContextImpl;
@@ -99,15 +100,24 @@ public class EventHandlerImplClient {
@SubscribeEvent(priority = EventPriority.HIGH)
public static void event(net.minecraftforge.client.event.ClientChatEvent event) {
EventResult process = ClientChatEvent.SEND.invoker().send(event.getMessage(), null);
if (process.isFalse()) {
event.setCanceled(true);
ChatProcessorImpl processor = new ChatProcessorImpl(event.getMessage(), null);
EventResult process = ClientChatEvent.PROCESS.invoker().process(processor);
if (process.isPresent()) {
if (process.isFalse())
event.setCanceled(true);
else {
event.setMessage(processor.getMessage());
if (process.isTrue()) {
event.setCanceled(true);
}
}
}
}
@SubscribeEvent(priority = EventPriority.HIGH)
public static void event(ClientChatReceivedEvent event) {
CompoundEventResult<Component> process = ClientChatEvent.RECEIVED.invoker().process(event.getBoundChatType(), event.getMessage());
CompoundEventResult<Component> process = ClientChatEvent.RECEIVED.invoker().process(event.getType(), event.getMessage(), event.getChatSender());
if (process.isPresent()) {
if (process.isFalse())
event.setCanceled(true);

30
forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java
View File

@@ -102,7 +102,7 @@ public class EventHandlerImplCommon {
@SubscribeEvent(priority = EventPriority.HIGH)
public static void event(RegisterCommandsEvent event) {
CommandRegistrationEvent.EVENT.invoker().register(event.getDispatcher(), event.getBuildContext(), event.getCommandSelection());
CommandRegistrationEvent.EVENT.invoker().register(event.getDispatcher(), event.getCommandSelection());
}
@SubscribeEvent(priority = EventPriority.HIGH)
@@ -140,24 +140,30 @@ public class EventHandlerImplCommon {
}
@SubscribeEvent(priority = EventPriority.HIGH)
public static void event(ServerChatEvent.Preview event) {
public static void event(ServerChatEvent event) {
class ChatComponentImpl implements ChatEvent.ChatComponent {
@Override
public Component get() {
return event.getMessage();
public Component getRaw() {
return Component.literal(event.getMessage());
}
@Override
public void set(Component component) {
event.setMessage(component);
public Component getFiltered() {
return event.getComponent();
}
@Override
public void setRaw(Component raw) {
// NO-OP
}
@Override
public void setFiltered(Component filtered) {
event.setComponent(filtered);
}
}
ChatEvent.DECORATE.invoker().decorate(event.getPlayer(), new ChatComponentImpl());
}
@SubscribeEvent(priority = EventPriority.HIGH)
public static void event(ServerChatEvent.Submitted event) {
EventResult process = ChatEvent.RECEIVED.invoker().received(event.getPlayer(), event.getMessage());
EventResult process = ChatEvent.SERVER.invoker().process(event.getPlayer(), new ChatComponentImpl());
if (process.isFalse())
event.setCanceled(true);
}

6
forge/src/main/resources/META-INF/mods.toml
View File

@@ -1,5 +1,5 @@
modLoader = "javafml"
loaderVersion = "[42,)"
loaderVersion = "[41,)"
issueTrackerURL = "https://github.com/shedaniel/architectury/issues"
license = "GNU LGPLv3"
@@ -17,13 +17,13 @@ license = "LGPL-3"
[[dependencies.architectury]]
modId = "minecraft"
mandatory = true
versionRange = "[1.19.1,)"
versionRange = "[1.19,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.architectury]]
modId = "forge"
mandatory = true
versionRange = "[42.0.0,)"
versionRange = "[41.0.94,)"
ordering = "NONE"
side = "BOTH"