Skip to content

Commit

Permalink
Missing files
Browse files Browse the repository at this point in the history
  • Loading branch information
Luligabi1 committed Mar 14, 2024
1 parent f3650b6 commit eb50860
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ package dev.nathanpb.dml.compat.rei.category
import dev.nathanpb.dml.MOD_ID
import dev.nathanpb.dml.compat.rei.ReiPlugin
import dev.nathanpb.dml.compat.rei.display.CrushingRecipeDisplay
import dev.nathanpb.dml.compat.rei.widgets.EntityDisplayWidget
import dev.nathanpb.dml.compat.rei.itemStack
import dev.nathanpb.dml.compat.rei.widgets.EntityDisplayWidget
import dev.nathanpb.dml.item.ITEM_SOOT_REDSTONE
import me.shedaniel.math.Point
import me.shedaniel.math.Rectangle
Expand Down Expand Up @@ -69,7 +69,7 @@ class CrushingDisplayCategory: DisplayCategory<CrushingRecipeDisplay> {
blockSlot,
Widgets.createSlot(Point(startPoint.x + 80, startPoint.y + 38)).entries(output.flatten())
).also { widgets ->
MinecraftClient.getInstance().player?.let { player ->
MinecraftClient.getInstance().player?.let { player -> // FIXME swing is seen on actual player
EntityDisplayWidget(
listOf(player),
startPoint.x + 24,
Expand Down
19 changes: 14 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.4-SNAPSHOT'
id 'fabric-loom' version '1.2-SNAPSHOT'
id 'maven-publish'
id 'org.jetbrains.kotlin.jvm' version '1.8.22'
id 'com.matthewprenger.cursegradle' version '1.4.0'
Expand All @@ -21,13 +21,17 @@ def RELEASE_TYPE =

@SuppressWarnings('GrMethodMayBeStatic')
def getChangeLog() {
return "https://github.com/CafeteriaGuild/DeepMobLearning-Refabricated/releases/tag/${URLEncoder.encode(project.mod_version, "utf-8")}"
return ""
}

def ENV = System.getenv()


repositories {
maven { url = "https://jitpack.io" }
maven { url = "https://maven.terraformersmc.com/releases/" }
maven { url = "https://maven.cafeteria.dev/releases/" }
maven { url = "https://maven.cafeteria.dev/" }
}

dependencies {
Expand Down Expand Up @@ -134,7 +138,10 @@ jar {
}

curseforge {
apiKey = project.property("curseforgeToken")
if(ENV.CURSEFORGE_API_KEY) {
apiKey = ENV.CURSEFORGE_API_KEY
}

project {
id = project.curseforge_id
changelog = getChangeLog()
Expand Down Expand Up @@ -164,10 +171,12 @@ curseforge {
}

modrinth {
token = project.property("modrinthToken")
if(ENV.MODRINTH_TOKEN) {
token = ENV.MODRINTH_TOKEN
}

projectId = project.modrinth_id
versionNumber = project.mod_version + "+" + project.minecraft_version
versionNumber = project.mod_version
uploadFile = remapJar
gameVersions = [project.minecraft_version]
loaders = ['fabric']
Expand Down
11 changes: 4 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
kotlin.code.style=official
org.gradle.jvmargs=-Xmx2G
org.gradle.configureondemand=false
fabric.loom.multiProjectOptimisation=true

# Fabric Properties
Expand All @@ -10,11 +11,10 @@ loader_version=0.14.22

#Fabric api
fabric_version=0.87.0+1.20.1
loom_version=1.4
loom_version=1.5

# Mod Properties
# !!! Do not change mod_version manually !!!
mod_version=0.5.14-BETA+1.20.1
mod_version=0.6.0-BETA+1.20.1
maven_group=dev.nathanpb
archives_base_name=deepmoblearning-refabricated
curseforge_id=398614
Expand All @@ -34,7 +34,4 @@ mixinextrasVersion=0.1.1
modmenuVersion=7.0.0

mcdUsername=mcd
mcdPassword=mcd

curseforgeToken=1
modrinthToken=1
mcdPassword=mcd
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ class FeatherFallingEffect : ProtectionLikeEffect(

override fun protectsAgainst(world: World, source: DamageSource) = source.isIn(DamageTypeTags.IS_FALL)

// FIXME scale protection

override fun acceptTier(tier: DataModelTier) = !tier.isMaxTier()
override fun minimumTier(): DataModelTier = DataModelTier.FAULTY
}

Large diffs are not rendered by default.

0 comments on commit eb50860

Please sign in to comment.