From 4d033b3ea20adae16e1cbc7d7a5536fce50a4158 Mon Sep 17 00:00:00 2001 From: Goldorion <38427877+Goldorion@users.noreply.github.com> Date: Tue, 16 Jun 2020 09:18:23 -0400 Subject: [PATCH 01/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fb7eae5..19a301a4 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ This project is not official. Not affiliated with the respective owners and main * Block (Mostly complete) - Ore generation (Nether and Overworld, Netherrack and Stone Respectively) - Block entities (Non pushable) - - Custom plants * Food (Mostly complete) * Fuel (Complete) * Function (Complete) * Item (Mostly Complete) * Itemgroups("Creative Tabs") (Complete) * Loot table (Complete) +* Plants (Not complete) * Recipe (Complete) * Tag (Complete) * Tool (Supports Pickaxe, Axe, Shovel, Hoe and Sword) From 4f59384a32ad3d3eba28c94ebe4dd168ac935936 Mon Sep 17 00:00:00 2001 From: Goldorion <38427877+Goldorion@users.noreply.github.com> Date: Wed, 17 Jun 2020 11:25:02 -0400 Subject: [PATCH 02/10] Biomes had the same ID --- src/fabric-1.15.2/templates/modbase/biomeRegistry.java.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fabric-1.15.2/templates/modbase/biomeRegistry.java.ftl b/src/fabric-1.15.2/templates/modbase/biomeRegistry.java.ftl index e8cb0ed6..5ea066ed 100644 --- a/src/fabric-1.15.2/templates/modbase/biomeRegistry.java.ftl +++ b/src/fabric-1.15.2/templates/modbase/biomeRegistry.java.ftl @@ -23,13 +23,13 @@ public class ${JavaModName}Biomes { public static void registerBiomes() { <#list w.getElementsOfType("BIOME") as biome> - ${biome?upper_case} = register(new ${biome}(), "${modid}"); + ${biome?upper_case} = register(new ${biome}(), "${modid}:${biome.getRegistryName()}"); FabricBiomes.addSpawnBiome(${JavaModName}Biomes.${biome?upper_case}); } - private static Biome register(Biome biome, String id) { - return Registry.register(Registry.BIOME, id, biome); + private static Biome register(Biome biome, String ID) { + return Registry.register(Registry.BIOME, ID, biome); } } From bca0b14e4da23dd9c611abe77f6c05702d849c40 Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 11:52:50 +0530 Subject: [PATCH 03/10] Fixed the issue template --- .github/ISSUE_TEMPLATE/bug_report.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0911918e..2cafb682 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -10,6 +10,8 @@ assignees: '' **Describe the bug** A clear and concise description of what the bug is. +**Affected version(s)** Release/Snapshot 0.X.X+foo + **To Reproduce** Steps to reproduce the behavior: 1. Go to '...' From 0b0806d2966663765e589de2acfedcbf002c90a1 Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 11:55:18 +0530 Subject: [PATCH 04/10] Fixed conflict --- .github/ISSUE_TEMPLATE/bug_report.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5e1d8775..e754130e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -13,9 +13,7 @@ A clear and concise description of what the bug is. <<<<<<< HEAD **Affected version(s)** Release/Snapshot 0.X.X+foo ======= -**Affected Version** -Snapshot / Release *state version number* ->>>>>>> origin/dev +**Affected Version** Snapshot / Release *state version number* **To Reproduce** Steps to reproduce the behavior: From f23d452f7f142813434b2c59891336c66742a59b Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 11:55:39 +0530 Subject: [PATCH 05/10] Fixed conflict again --- .github/ISSUE_TEMPLATE/bug_report.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e754130e..2cafb682 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -10,10 +10,7 @@ assignees: '' **Describe the bug** A clear and concise description of what the bug is. -<<<<<<< HEAD **Affected version(s)** Release/Snapshot 0.X.X+foo -======= -**Affected Version** Snapshot / Release *state version number* **To Reproduce** Steps to reproduce the behavior: From 456bfcfae53099a7fb77ae199800e18125716866 Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 13:25:37 +0530 Subject: [PATCH 06/10] Added extra line to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 712bf019..93c0009b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ bin # idea out +build *.ipr *.iws *.iml From f53a11cb09e24164b20de425fd2543db2f1afe93 Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 20:37:13 +0530 Subject: [PATCH 07/10] Moved contributing guidelines Changes to be committed: renamed: CONTRIBUTING.md -> .github/CONTRIBUTING.md --- CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md From 680942fe46166900c5f404820b0fe3a22ee76bc2 Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 20:39:13 +0530 Subject: [PATCH 08/10] Changed issue template name Changes to be committed: modified: .github/ISSUE_TEMPLATE/bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2cafb682..7021cb79 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,7 +1,7 @@ --- name: Bug report about: Create a report to help us improve -title: '' +title: '[REQUEST] Title' labels: '' assignees: '' From 33c26dbaf304350114b10e959f2b72fbf7a2bfae Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 20:46:32 +0530 Subject: [PATCH 09/10] Tweaked files Changes to be committed: modified: src/fabric-1.15.2/generator.yaml modified: src/fabric-1.15.2/templates/modbase/pack.mcmeta.ftl modified: src/fabric-1.15.2/workspacebase/run/options.txt --- src/fabric-1.15.2/generator.yaml | 4 +--- src/fabric-1.15.2/templates/modbase/pack.mcmeta.ftl | 2 +- src/fabric-1.15.2/workspacebase/run/options.txt | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/fabric-1.15.2/generator.yaml b/src/fabric-1.15.2/generator.yaml index 08ba38e4..4cc9756d 100644 --- a/src/fabric-1.15.2/generator.yaml +++ b/src/fabric-1.15.2/generator.yaml @@ -1,7 +1,7 @@ name: Minecraft Fabric for 1.15.2 (@buildfileversion) basefeatures: [model_json,model_obj] partial_support: [block,item,food,armor,biome,sounds] -status: dev +status: stable buildfileversion: 0.8.7+build.201 gradle: @@ -10,13 +10,11 @@ gradle: run_server: runServer export_file: "build/libs/sources.jar" -# base generator roots source_root: "@WORKSPACEROOT/src/main/java" res_root: "@WORKSPACEROOT/src/main/resources" mod_assets_root: "@RESROOT/assets/@modid" mod_data_root: "@RESROOT/data/@modid" -# specific resource folders sounds_dir: "@MODASSETSROOT/sounds" other_textures_dir: "@MODASSETSROOT/textures" block_textures_dir: "@MODASSETSROOT/textures/blocks" diff --git a/src/fabric-1.15.2/templates/modbase/pack.mcmeta.ftl b/src/fabric-1.15.2/templates/modbase/pack.mcmeta.ftl index c97a72cf..b038faec 100644 --- a/src/fabric-1.15.2/templates/modbase/pack.mcmeta.ftl +++ b/src/fabric-1.15.2/templates/modbase/pack.mcmeta.ftl @@ -1,6 +1,6 @@ { "pack": { "pack_format": 4, - "description": "${modid} mod resources" + "description": "${modid} resources" } } diff --git a/src/fabric-1.15.2/workspacebase/run/options.txt b/src/fabric-1.15.2/workspacebase/run/options.txt index 1b2fa6a8..239d4b74 100644 --- a/src/fabric-1.15.2/workspacebase/run/options.txt +++ b/src/fabric-1.15.2/workspacebase/run/options.txt @@ -5,8 +5,8 @@ renderDistance:5 fancyGraphics:false entityShadows:true enableVsync:false -maxFps:260 +maxFps:80 particles:0 renderClouds:false ao:0 -mipmapLevels:2 \ No newline at end of file +mipmapLevels:2 From 4bca57555e6d4ded002359fc329a331c0c58d999 Mon Sep 17 00:00:00 2001 From: BoogieMonster1O1 Date: Thu, 18 Jun 2020 20:49:42 +0530 Subject: [PATCH 10/10] Updated loader version Changes to be committed: modified: src/fabric-1.15.2/generator.yaml modified: src/fabric-1.15.2/workspacebase/build.gradle --- src/fabric-1.15.2/generator.yaml | 4 ++-- src/fabric-1.15.2/workspacebase/build.gradle | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/fabric-1.15.2/generator.yaml b/src/fabric-1.15.2/generator.yaml index 4cc9756d..f41e6658 100644 --- a/src/fabric-1.15.2/generator.yaml +++ b/src/fabric-1.15.2/generator.yaml @@ -1,8 +1,8 @@ name: Minecraft Fabric for 1.15.2 (@buildfileversion) basefeatures: [model_json,model_obj] -partial_support: [block,item,food,armor,biome,sounds] +partial_support: [block,item,food,armor,biome] status: stable -buildfileversion: 0.8.7+build.201 +buildfileversion: 0.8.8+build.202 gradle: setup_task: genSources diff --git a/src/fabric-1.15.2/workspacebase/build.gradle b/src/fabric-1.15.2/workspacebase/build.gradle index 6569b945..42b78abf 100644 --- a/src/fabric-1.15.2/workspacebase/build.gradle +++ b/src/fabric-1.15.2/workspacebase/build.gradle @@ -13,13 +13,13 @@ group = project.maven_group dependencies { minecraft "com.mojang:minecraft:1.15.2" mappings "net.fabricmc:yarn:1.15.2+build.17:v2" - modImplementation "net.fabricmc:fabric-loader:0.8.7+build.201" + modImplementation "net.fabricmc:fabric-loader:0.8.8+build.202" //Fabric api modImplementation "net.fabricmc.fabric-api:fabric-api:0.12.0+build.313-1.15" - //Mod Menu - modImplementation "io.github.prospector:modmenu:1.10.2+build.32" + //Mod Menu + modImplementation "io.github.prospector:modmenu:1.10.2+build.32" } processResources { @@ -35,9 +35,6 @@ processResources { } } -// 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" }