Merge branch 'MCreator:master' into master

willpill · Jan 21, 2024 · be3d80d · be3d80d
2 parents 08d7bde + 07c90a8
commit be3d80d
Show file tree

Hide file tree

Showing 110 changed files with 1,140 additions and 572 deletions.
diff --git a/build.gradle b/build.gradle
@@ -121,7 +121,7 @@ dependencies {
 }
 
 javafx {
-    version = '21.0.1'
+    version = '21.0.2'
     modules = ['javafx.web', 'javafx.swing']
     configurations = ['provided', 'win64', 'macX64', 'macAarch64', 'linux64'] // we provide natives during deployment or with SDK
 }

diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/biome_entered.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/biome_entered.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:location",
   "conditions": {
     "player": [
@@ -13,4 +13,4 @@
         }
     ]
   }
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/block_placed.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/block_placed.json.ftl
@@ -1,6 +1,6 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:placed_block",
   "conditions": {
     "block": "${input$block}"
   }
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/custom_trigger.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/custom_trigger.json.ftl
@@ -1,3 +1,3 @@
-{
+"${registryname}_${cbi}": {
     "trigger": "minecraft:impossible"
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/dimension_entered.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/dimension_entered.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:changed_dimension",
   "conditions": {
     <#if field$dimension == "Surface">
@@ -11,4 +11,4 @@
     "to": "${generator.getResourceLocationForModElement(field$dimension.toString().replace("CUSTOM:", ""))}"
     </#if>
   }
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/dimension_left.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/dimension_left.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:changed_dimension",
   "conditions": {
     <#if field$dimension == "Surface">
@@ -11,4 +11,4 @@
     "from": "${generator.getResourceLocationForModElement(field$dimension.toString().replace("CUSTOM:", ""))}"
     </#if>
   }
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/item_consumed.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/item_consumed.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:consume_item",
   "conditions": {
     "item": {
@@ -7,4 +7,4 @@
         ]
     }
   }
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/item_damaged.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/item_damaged.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:item_durability_changed",
   "conditions": {
     "item": {
@@ -11,4 +11,4 @@
         }
       }
   }
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/item_in_inventory.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/item_in_inventory.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:inventory_changed",
   "conditions": {
     "items": [
@@ -13,4 +13,4 @@
       }
     ]
   }
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/tick.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/jsontriggers/tick.json.ftl
@@ -1,3 +1,3 @@
-{
+"${registryname}_${cbi}": {
     "trigger": "minecraft:tick"
-}
+},
diff --git a/plugins/generator-1.19.4/datapack-1.19.4/templates/advancement.json.ftl b/plugins/generator-1.19.4/datapack-1.19.4/templates/advancement.json.ftl
@@ -22,7 +22,7 @@
         },
     </#if>
     "criteria": {
-      "${registryname}": ${triggercode}
+      ${triggercode?keep_before_last(",")}
     }
     <#if data.hasRewards()>,
     "rewards": {

diff --git a/plugins/generator-1.19.4/forge-1.19.4/templates/json/advancement.json.ftl b/plugins/generator-1.19.4/forge-1.19.4/templates/json/advancement.json.ftl
@@ -26,7 +26,7 @@
         },
     </#if>
     "criteria": {
-      "${registryname}": ${triggercode}
+      ${triggercode?keep_before_last(",")}
     }
     <#if data.hasRewards()>,
     "rewards": {

diff --git a/plugins/generator-1.19.4/forge-1.19.4/templates/modbase/mod.java.ftl b/plugins/generator-1.19.4/forge-1.19.4/templates/modbase/mod.java.ftl
@@ -49,8 +49,12 @@ import org.apache.logging.log4j.Logger;
 	}
 
 	private static final String PROTOCOL_VERSION = "1";
-	public static final SimpleChannel PACKET_HANDLER = NetworkRegistry.newSimpleChannel(new ResourceLocation(MODID, MODID),
-		() -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals);
+	public static final SimpleChannel PACKET_HANDLER = NetworkRegistry.newSimpleChannel(
+			new ResourceLocation(MODID, MODID),
+			() -> PROTOCOL_VERSION,
+			PROTOCOL_VERSION::equals,
+			<#if settings.isServerSideOnly()>clientVersion -> true<#else>PROTOCOL_VERSION::equals</#if>
+	);
 
 	private static int messageID = 0;
 

diff --git a/plugins/generator-1.19.4/forge-1.19.4/templates/modbase/mods.toml.ftl b/plugins/generator-1.19.4/forge-1.19.4/templates/modbase/mods.toml.ftl
@@ -24,6 +24,9 @@ authors="${settings.getAuthor()}"
 <#if settings.getDescription()?has_content>
 description="${settings.getDescription()}"
 </#if>
+<#if settings.isServerSideOnly()>
+displayTest="IGNORE_SERVER_VERSION"
+</#if>
 
 [[dependencies.${settings.getModID()}]]
     modId="minecraft"
@@ -32,15 +35,6 @@ description="${settings.getDescription()}"
     ordering="NONE"
     side="BOTH"
 
-<#if !settings.isDisableForgeVersionCheck()>
-[[dependencies.${settings.getModID()}]]
-    modId="forge"
-    mandatory=true
-    versionRange="[${generator.getGeneratorBuildFileVersion()}]"
-    ordering="NONE"
-    side="BOTH"
-</#if>
-
 <#list settings.getRequiredMods() as e>
 [[dependencies.${settings.getModID()}]]
     modId="${e}"

diff --git a/plugins/generator-1.19.4/forge-1.19.4/templates/projectile/projectile_renderer.java.ftl b/plugins/generator-1.19.4/forge-1.19.4/templates/projectile/projectile_renderer.java.ftl
@@ -31,6 +31,8 @@
 <#-- @formatter:off -->
 package ${package}.client.renderer;
 
+import com.mojang.math.Axis;
+
 public class ${name}Renderer extends EntityRenderer<${name}Entity> {
 
 	private static final ResourceLocation texture = new ResourceLocation("${modid}:textures/entities/${data.customModelTexture}");

diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/biome_entered.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/biome_entered.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:location",
   "conditions": {
     "player": [
@@ -13,4 +13,4 @@
         }
     ]
   }
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/block_placed.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/block_placed.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:placed_block",
   "conditions": {
     "location": [
@@ -8,4 +8,4 @@
       }
     ]
   }
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/custom_trigger.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/custom_trigger.json.ftl
@@ -1,3 +1,3 @@
-{
+"${registryname}_${cbi}": {
     "trigger": "minecraft:impossible"
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/dimension_entered.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/dimension_entered.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:changed_dimension",
   "conditions": {
     <#if field$dimension == "Surface">
@@ -11,4 +11,4 @@
     "to": "${generator.getResourceLocationForModElement(field$dimension.toString().replace("CUSTOM:", ""))}"
     </#if>
   }
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/dimension_left.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/dimension_left.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:changed_dimension",
   "conditions": {
     <#if field$dimension == "Surface">
@@ -11,4 +11,4 @@
     "from": "${generator.getResourceLocationForModElement(field$dimension.toString().replace("CUSTOM:", ""))}"
     </#if>
   }
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/item_consumed.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/item_consumed.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:consume_item",
   "conditions": {
     "item": {
@@ -7,4 +7,4 @@
         ]
     }
   }
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/item_damaged.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/item_damaged.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:item_durability_changed",
   "conditions": {
     "item": {
@@ -11,4 +11,4 @@
         }
       }
   }
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/item_in_inventory.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/item_in_inventory.json.ftl
@@ -1,4 +1,4 @@
-{
+"${registryname}_${cbi}": {
   "trigger": "minecraft:inventory_changed",
   "conditions": {
     "items": [
@@ -13,4 +13,4 @@
       }
     ]
   }
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/tick.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/jsontriggers/tick.json.ftl
@@ -1,3 +1,3 @@
-{
+"${registryname}_${cbi}": {
     "trigger": "minecraft:tick"
-}
+},
diff --git a/plugins/generator-1.20.1/datapack-1.20.1/templates/advancement.json.ftl b/plugins/generator-1.20.1/datapack-1.20.1/templates/advancement.json.ftl
@@ -22,7 +22,7 @@
         },
     </#if>
     "criteria": {
-      "${registryname}": ${triggercode}
+      ${triggercode?keep_before_last(",")}
     }
     <#if data.hasRewards()>,
     "rewards": {

diff --git a/plugins/generator-1.20.1/forge-1.20.1/templates/json/advancement.json.ftl b/plugins/generator-1.20.1/forge-1.20.1/templates/json/advancement.json.ftl
@@ -26,7 +26,7 @@
         },
     </#if>
     "criteria": {
-      "${registryname}": ${triggercode}
+      ${triggercode?keep_before_last(",")}
     }
     <#if data.hasRewards()>,
     "rewards": {

diff --git a/plugins/generator-1.20.1/forge-1.20.1/templates/modbase/mod.java.ftl b/plugins/generator-1.20.1/forge-1.20.1/templates/modbase/mod.java.ftl
@@ -50,8 +50,12 @@ import org.apache.logging.log4j.Logger;
 	}
 
 	private static final String PROTOCOL_VERSION = "1";
-	public static final SimpleChannel PACKET_HANDLER = NetworkRegistry.newSimpleChannel(new ResourceLocation(MODID, MODID),
-		() -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals);
+	public static final SimpleChannel PACKET_HANDLER = NetworkRegistry.newSimpleChannel(
+			new ResourceLocation(MODID, MODID),
+			() -> PROTOCOL_VERSION,
+			PROTOCOL_VERSION::equals,
+			<#if settings.isServerSideOnly()>clientVersion -> true<#else>PROTOCOL_VERSION::equals</#if>
+	);
 
 	private static int messageID = 0;
 

diff --git a/plugins/generator-1.20.1/forge-1.20.1/templates/modbase/mods.toml.ftl b/plugins/generator-1.20.1/forge-1.20.1/templates/modbase/mods.toml.ftl
@@ -24,6 +24,9 @@ authors="${settings.getAuthor()}"
 <#if settings.getDescription()?has_content>
 description="${settings.getDescription()}"
 </#if>
+<#if settings.isServerSideOnly()>
+displayTest="IGNORE_SERVER_VERSION"
+</#if>
 
 [[dependencies.${settings.getModID()}]]
     modId="minecraft"
@@ -32,15 +35,6 @@ description="${settings.getDescription()}"
     ordering="NONE"
     side="BOTH"
 
-<#if !settings.isDisableForgeVersionCheck()>
-[[dependencies.${settings.getModID()}]]
-    modId="forge"
-    mandatory=true
-    versionRange="[${generator.getGeneratorBuildFileVersion()}]"
-    ordering="NONE"
-    side="BOTH"
-</#if>
-
 <#list settings.getRequiredMods() as e>
 [[dependencies.${settings.getModID()}]]
     modId="${e}"

diff --git a/plugins/generator-1.20.1/forge-1.20.1/templates/projectile/projectile_renderer.java.ftl b/plugins/generator-1.20.1/forge-1.20.1/templates/projectile/projectile_renderer.java.ftl
@@ -31,6 +31,8 @@
 <#-- @formatter:off -->
 package ${package}.client.renderer;
 
+import com.mojang.math.Axis;
+
 public class ${name}Renderer extends EntityRenderer<${name}Entity> {
 
 	private static final ResourceLocation texture = new ResourceLocation("${modid}:textures/entities/${data.customModelTexture}");

diff --git a/plugins/mcreator-core/blockly/js/mcreator_blocks.js b/plugins/mcreator-core/blockly/js/mcreator_blocks.js
@@ -96,9 +96,9 @@ Blockly.Blocks['args_start'] = {
 Blockly.Blocks['advancement_trigger'] = {
     init: function () {
         this.appendDummyInput().appendField(javabridge.t("blockly.block.advancement_trigger"));
-        this.setPreviousStatement(true);
+        this.setStyle('hat_blocks');
+        this.setNextStatement(true);
         this.setColour(150);
-        this.setTooltip(javabridge.t("blockly.block.advancement_trigger.tooltip"));
     }
 };
 

diff --git a/plugins/mcreator-core/jsontriggers/biome_entered.json b/plugins/mcreator-core/jsontriggers/biome_entered.json
@@ -7,6 +7,7 @@
     }
   ],
   "inputsInline": true,
+  "previousStatement": null,
   "nextStatement": null,
   "colour": 35,
   "mcreator": {

diff --git a/plugins/mcreator-core/jsontriggers/block_placed.json b/plugins/mcreator-core/jsontriggers/block_placed.json
@@ -7,6 +7,7 @@
     }
   ],
   "inputsInline": true,
+  "previousStatement": null,
   "nextStatement": null,
   "colour": 60,
   "mcreator": {