Skip to content

Commit

Permalink
sync sakura-ryoko/litematica 1.21.3-0.20.0-sakura.3
Browse files Browse the repository at this point in the history
  • Loading branch information
TexBlock committed Nov 8, 2024
1 parent cb51a37 commit ed5809d
Show file tree
Hide file tree
Showing 83 changed files with 6,609 additions and 3,002 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
## Change
- sync `sakura-ryoko/litematica` 1.21-0.19.3-sakura.3
- Add Litematic Version / Schema display in File Browser.
- sync `sakura-ryoko/litematica` 1.21.3-0.20.0-sakura.3
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ publisher {
setChangelog(file("CHANGELOG.md").getText("UTF-8"))
setVersion("${project.version}")
setDisplayName("${project.version}")
setGameVersions("1.21", "1.21.1")
setGameVersions("1.21.2", "1.21.3")
setLoaders(loom.platform.get().id())
setCurseEnvironment("client")
setArtifact(remapJar)
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
# Base properties
minecraft_version="1.21.1"
yarn_mappings="1.21.1+build.3"
minecraft_version="1.21.3"
yarn_mappings="1.21.3+build.2"
mappings_patch="1.21+build.4"
neoforge="21.1.68"
neoforge="21.3.2-beta"

# Mod properties
version="0.1.13"
version="0.1.14"
maven-group="org.thinkingstudio.forgematica"
archives-name="Forgematica"

Expand All @@ -15,7 +15,7 @@ id-modrinth="dCKRaeBC"
id-curseforge="912441"

# Mod dependencies
mafglib="0.1.23-mc1.21.1"
mafglib="0.1.25-mc1.21.3"
badpackets="neo-0.8.1"

# Libraries
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/fi/dy/masa/litematica/InitHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

import net.minecraft.client.MinecraftClient;

import fi.dy.masa.malilib.config.ConfigManager;
import fi.dy.masa.malilib.event.*;
import fi.dy.masa.malilib.interfaces.IInitializationHandler;
import fi.dy.masa.malilib.interfaces.IRenderer;
import fi.dy.masa.litematica.config.Configs;
import fi.dy.masa.litematica.data.DataManager;
import fi.dy.masa.litematica.data.EntitiesDataStorage;
import fi.dy.masa.litematica.event.*;
import fi.dy.masa.litematica.render.infohud.StatusInfoRenderer;
import fi.dy.masa.litematica.scheduler.ClientTickHandler;
import fi.dy.masa.malilib.config.ConfigManager;
import fi.dy.masa.malilib.event.*;
import fi.dy.masa.malilib.interfaces.IInitializationHandler;
import fi.dy.masa.malilib.interfaces.IRenderer;

public class InitHandler implements IInitializationHandler
{
Expand All @@ -27,10 +27,10 @@ public void registerModHandlers()

IRenderer renderer = new RenderHandler();
RenderEventHandler.getInstance().registerGameOverlayRenderer(renderer);
RenderEventHandler.getInstance().registerWorldLastRenderer(renderer);
RenderEventHandler.getInstance().registerWorldPreWeatherRenderer(renderer);
//RenderEventHandler.getInstance().registerWorldLastRenderer(renderer);

ServerListener serverListener = new ServerListener();
ServerHandler.getInstance().registerServerHandler(serverListener);
ServerHandler.getInstance().registerServerHandler(new ServerListener());

TickHandler.getInstance().registerClientTickHandler(new ClientTickHandler());
TickHandler.getInstance().registerClientTickHandler(EntitiesDataStorage.getInstance());
Expand Down
1 change: 1 addition & 0 deletions src/main/java/fi/dy/masa/litematica/Reference.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

public class Reference
{
public static final String ID = "litematica";
public static final String MOD_ID = "forgematica";
public static final String MOD_NAME = "Forgematica";
public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package fi.dy.masa.litematica.compat.modmenu;

import fi.dy.masa.litematica.gui.GuiConfigs;
import org.thinkingstudio.mafglib.loader.gui.ModConfigScreenFactory;
import org.thinkingstudio.mafglib.loader.gui.ModConfigScreenInitializer;

public class ModMenuImpl implements ModConfigScreenInitializer
{
@Override
public ModConfigScreenFactory getModConfigScreenFactory()
{
return (modContainer, screen) -> {
GuiConfigs gui = new GuiConfigs();
gui.setParent(screen);
return gui;
};
}
}
292 changes: 152 additions & 140 deletions src/main/java/fi/dy/masa/litematica/config/Configs.java

Large diffs are not rendered by default.

153 changes: 78 additions & 75 deletions src/main/java/fi/dy/masa/litematica/config/Hotkeys.java

Large diffs are not rendered by default.

Loading

0 comments on commit ed5809d

Please sign in to comment.