Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21 #6

Merged
merged 8 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 26 additions & 110 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,118 +1,34 @@
# User-specific stuff
.idea/

*.iml
*.ipr
*.iws

# IntelliJ
# Gradle
.gradle/
build/
out/
# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*
classes/

# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk
# Quilt Loom
remappedSrc/
run/

.gradle
build/
# Eclipse
*.launch

# Ignore Gradle GUI config
gradle-app.setting
# IntelliJ Idea
.idea/
*.iml
*.ipr
*.iws

# Cache of project
.gradletasknamecache
# Fleet
.fleet/

**/build/
# Visual Studio Code
.settings/
.vscode/
bin/
.classpath
.project

# Common working directory
run/
# Eclipse JDT LS
workspace/

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# macOS
*.DS_Store
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G

minecraft_version=1.20.6
quilt_mappings=6
loader_version=0.15.6
fabric_version=0.97.8+1.20.6
modmenu_version=10.0.0-beta.1
minecraft_version=1.21
quilt_mappings=1
loader_version=0.15.11
fabric_version=0.100.1+1.21
modmenu_version=11.0.0-beta.1

mod_version = 1.0.3+mc1.20.6
mod_version = 1.0.4+mc1.21
maven_group = io.ix0rai
archives_base_name = ramel
18 changes: 12 additions & 6 deletions src/main/java/io/ix0rai/ramel/client/RamelConfigScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.option.SimpleOptionsScreen;
import net.minecraft.client.gui.screen.option.GameOptionsScreen;
import net.minecraft.client.option.GameOptions;
import net.minecraft.client.option.Option;
import net.minecraft.text.Text;
Expand All @@ -17,12 +17,18 @@
import java.util.stream.StreamSupport;

@Environment(EnvType.CLIENT)
public class RamelConfigScreen extends SimpleOptionsScreen {
@SuppressWarnings("unchecked")
public class RamelConfigScreen extends GameOptionsScreen {
public RamelConfigScreen(@Nullable Screen parent) {
super(parent, MinecraftClient.getInstance().options, Text.translatable("ramel.config.title"),
StreamSupport.stream(Config.INSTANCE.values().spliterator(), false).map(value -> createOptional((TrackedValue<Float>) value)).toArray(Option[]::new)
);
super(parent, MinecraftClient.getInstance().options, Text.translatable("ramel.config.title"));
}

@Override
@SuppressWarnings("unchecked")
protected void method_60325() { // addOptions
// this.list
assert this.field_51824 != null;
this.field_51824.addEntries(StreamSupport.stream(Config.INSTANCE.values().spliterator(), false)
.map(value -> createOptional((TrackedValue<Float>) value)).toArray(Option[]::new));
}

@SuppressWarnings("all")
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
],

"depends": {
"fabricloader": ">=0.15.6",
"minecraft": ">=1.20.6"
"fabricloader": ">=0.15.11",
"minecraft": ">=1.21-"
},

"custom": {
Expand Down
Loading