Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 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
7 changes: 5 additions & 2 deletions build.gradle
Comment thread
tticehurst marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
}

architectury {
Expand All @@ -17,7 +17,10 @@ subprojects {

dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
mappings loom.layered {
mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
mappings "dev.architectury:yarn-mappings-patch-forge:${rootProject.yarn_mappings_patch}"
}
// TODO consider using to official mappings?
// mappings loom.officialMojangMappings()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
public class CollisionWhitelist {

private static final Collection<Class<? extends Block>> transparentWhitelist = List.of(
AbstractGlassBlock.class,
StainedGlassBlock.class,
TintedGlassBlock.class,
PaneBlock.class,
BarrierBlock.class
);
BarrierBlock.class);

private static final Collection<Class<? extends Block>> openableWhitelist = List.of(
FenceGateBlock.class,
DoorBlock.class,
TrapdoorBlock.class
);
TrapdoorBlock.class);

public static boolean isTransparent(Block block) {
return isMatch(block, transparentWhitelist);
Expand Down
12 changes: 6 additions & 6 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
modLoader = "javafml"
loaderVersion = "[48,)"
loaderVersion = "[49,)"
issueTrackerURL = "https://github.com/hashalite/Freecam/issues"
license = "MIT"

[[mods]]
modId = "freecam"
version = "${version}"
displayName = "Freecam"
logoFile="icon.png"
authors="hashalite"
logoFile = "icon.png"
authors = "hashalite"
description = '''
A highly customizable freecam mod.
'''
Expand All @@ -17,13 +17,13 @@ A highly customizable freecam mod.
[[dependencies.freecam]]
modId = "forge"
mandatory = true
versionRange = "[48,)"
versionRange = "[49,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.freecam]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.2,)"
versionRange = "[1.20.4,)"
ordering = "NONE"
side = "BOTH"
side = "BOTH"
20 changes: 11 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
org.gradle.jvmargs=-Xmx2G

# Check versions on https://modmuss50.me/fabric.html
minecraft_version=1.20.2
yarn_mappings=1.20.2+build.2
minecraft_version=1.20.4

yarn_mappings=1.20.4+build.3
yarn_mappings_patch=1.20.4+build.1

enabled_platforms=fabric,forge

archives_base_name=freecam
mod_version=1.2.1.1
maven_group=net.xolt.freecam

architectury_version=10.0.16
architectury_version=11.0.8

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 If #129 gets merged this will conflict.


fabric_loader_version=0.14.25
fabric_api_version=0.91.1+1.20.2
fabric_loader_version=0.15.1
fabric_api_version=0.91.2+1.20.4

# See https://files.minecraftforge.net
forge_version=1.20.2-48.0.13

modmenu_version=8.0.0
cloth_version=12.0.109
forge_version=1.20.4-49.0.9

modmenu_version=9.0.0-pre.1
cloth_version=13.0.114

Empty file modified gradlew
100644 → 100755

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This is adding execute file permission (guessing the file was previously committed on windows). This probably should be a separate commit... @hashalite?

Empty file.