Merge branch 'dev' into 1.15.2 (PR 31)

Goldorion · Jun 18, 2020 · 889a1db · 889a1db
2 parents d38f26f + 4bca575
commit 889a1db
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 20 deletions.
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git 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: ''
 
@@ -10,8 +10,7 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**Affected Version**
-Snapshot / Release *state version number*
+**Affected version(s)** Release/Snapshot 0.X.X+foo
 
 **To Reproduce**
 Steps to reproduce the behavior:

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ bin
 
 # idea
 out
+build
 *.ipr
 *.iws
 *.iml

diff --git a/src/fabric-1.15.2/generator.yaml b/src/fabric-1.15.2/generator.yaml
@@ -1,22 +1,20 @@
 name: Minecraft Fabric for 1.15.2 (@buildfileversion)
 basefeatures: [model_json,model_obj]
-partial_support: [block,item,food,armor,biome,sounds]
-status: dev
-buildfileversion: 0.8.7+build.201
+partial_support: [block,item,food,armor,biome]
+status: stable
+buildfileversion: 0.8.8+build.202
 
 gradle:
   setup_task: genSources
   run_client: runClient
   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/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});
     </#list>
   }
 
-  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);
 	}
 
 }

diff --git 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/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"
 }

diff --git 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
+mipmapLevels:2
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ bin @@
     # idea
     out
+    build
     *.ipr
     *.iws
     *.iml
@@ Expand Down @@