Skip to content

Commit

Permalink
Delicious Dishes 2.1.0 - Modernization, New Food
Browse files Browse the repository at this point in the history
Today marks my 17th Birthday, and I've got something cooking up for ya'!
After a 2-year hiatus, my first big feature mod Delicious Dishes makes a return!

- Update from 1.16 to 1.19
- Code modernization
- Switch from Cloth Config to MidnightLib
- New Food: Ukrainian Borscht and Pizza Margherita
- Added Glow Berry Ice Cream (applies Glowing Effect for 5 seconds)
- Added Spaceburger (Can be found in chests on planets from Ad Astra!)
- Added Patchouli entries for all the new features
- Fixed multiple long-standing bugs
- Added Bowl (right now only for Borscht, though I might add some more soups, stews and desserts in the future)
  • Loading branch information
Motschen committed Oct 7, 2022
1 parent 4adf118 commit 5417b89
Show file tree
Hide file tree
Showing 123 changed files with 3,104 additions and 2,408 deletions.
8 changes: 2 additions & 6 deletions .gitignore
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
# gradle

.gradle/
build/classes/
build/generated/
build/libs/
build/resources/
build/tmp/
out/
classes/
build/

# idea

Expand All @@ -26,4 +22,4 @@ bin/

# fabric

run/
run/
50 changes: 21 additions & 29 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,64 +1,56 @@
plugins {
id 'fabric-loom' version '0.2.7-SNAPSHOT'
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

minecraft {
}

repositories {
maven { url "https://jitpack.io" }
maven { url "http://server.bbkr.space/artifactory/libs-release" }
maven { url 'https://maven.blamejared.com' }
maven { url "https://api.modrinth.com/maven" }
flatDir { dirs 'localMaven'}
}

dependencies {
//to change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modImplementation "vazkii.patchouli:Patchouli:${patchouli_version}"
modImplementation "vazkii.patchouli:Patchouli:${patchouli_version}"

modImplementation "com.github.Draylar:maybe-data:${maybedata_version}"
include "com.github.Draylar:maybe-data:${maybedata_version}"
modImplementation "eu.midnightdust:midnight-hats:${midnighthats_version}"
include "eu.midnightdust:midnight-hats:${midnighthats_version}"

modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}")
include ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}")
modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}")
include ("me.shedaniel.cloth:config-2:${project.cloth_config_version}")
modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}")

modImplementation "maven.modrinth:midnightlib:${midnightlib_version}"
include "maven.modrinth:midnightlib:${midnightlib_version}"
}

processResources {
inputs.property "version", project.version

from(sourceSets.main.resources.srcDirs) {
include "fabric.mod.json"
filesMatching("fabric.mod.json") {
expand "version": project.version
}

from(sourceSets.main.resources.srcDirs) {
exclude "fabric.mod.json"
}
}

// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"

// Minecraft 1.17 (21w19a) upwards uses Java 16.
it.options.release = 17
}

// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
Expand Down
Binary file removed build/loom-cache/maybe-data-1.0.0-1.16.2.jar
Binary file not shown.
Binary file removed build/loom-cache/midnight-hats-1.0.2.jar
Binary file not shown.
23 changes: 8 additions & 15 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,18 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.16.2
yarn_mappings=1.16.2+build.6
loader_version=0.9.1+build.205
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.18
loader_version=0.14.9

# Mod Properties
mod_version = 2.0.0
mod_version = 2.1.0
maven_group = eu.midnightdust.motschen
archives_base_name = dishes

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.17.2+build.396-1.16
patchouli_version=1.16-40-FABRIC
maybedata_version=1.0.0-1.16.2

# Config stuff
auto_config_version = 3.2.0-unstable
cloth_config_version = 4.7.0-unstable
mod_menu_version = 1.14.6+build.31

# MidnightHats
midnighthats_version=1.0.2
fabric_version=0.62.0+1.19.2
patchouli_version=1.19.2-76-FABRIC
maybedata_version=1.3.2-fixed-1.19
midnightlib_version=0.6.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 5417b89

Please sign in to comment.