From d336a7b91b85d4691ef2bf6190a10da77753bb09 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 20 Oct 2019 01:07:49 -0300 Subject: [PATCH 1/2] docs to 1.5 --- .../java/carpet/script/CarpetExpression.java | 22 ++++++++++--------- src/main/java/carpet/script/Expression.java | 8 +++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index deb9d57e..f3abbba6 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -2958,7 +2958,7 @@ public class CarpetExpression this.expr.addLazyFunction("store_app_data", -1, (c, t, lv) -> { if (lv.size() == 0) - throw new InternalExpressionException("'store_app_data' needs nbt tag and optional file"); + throw new InternalExpressionException("'store_app_data' needs NBT tag and an optional file"); Value val = lv.get(0).evalValue(c); String file = null; if (lv.size()>1) @@ -3165,7 +3165,7 @@ public class CarpetExpression } /** - *

/script load / unload <module> (shared?), /script in <module> commands

+ *

/script load / unload <app> (global?), /script in <app> commands

*
*

load / unload commands allow for very conventient way of writing your code, providing it to the game * and distribute with your worlds without the need of use of commandblocks. Just place your scarpet code in the /scripts @@ -3181,13 +3181,15 @@ public class CarpetExpression * // baz = foo() * *

- *

/script load/unload <module> (?shared)

+ *

/script load/unload <app> (?global)

*

Loading operation will load that script code from disk and execute it right away. You would probably use it to * load some stored procedures to be used for later. To reload the module, just type /script load again. * Reloading removes all the current global state (globals and functions) that were added later by the module.

*

Loading a module, if it contains a __command() method, will attempt to registed a command with that - * module name, and register all public (no underscore) functions available in the module as subcommands. It will also + * app name, and register all public (no underscore) functions available in the module as subcommands. It will also * bind specific events to the event system (check Events section for details).

+ *

Loaded apps have the ability to store and load external files, especially their persistent tag state. + * For that check load_app_data and store_app_data functions.

*

If an app defines __config method, and that method returns a map, it will be used to apply custom * settings for this app. Currently the following options are supported:

* - *

Unloading a module removes all of its state from the game, disables commands, and removes bounded events

- *

Scripts can be loaded in shared and player mode. Default is player, so all globals and stored functions are + *

Unloading an app removes all of its state from the game, disables commands, and removes bounded events

+ *

Scripts can be loaded in shared(global) and player mode. Default is player, so all globals and stored functions are * individual for each player, meaning scripts don't need to worry about making sure they store some intermittent data - * for each player independently. In shared mode - all global values and stored functions are shared among all players. - * To access specific player data with commandblocks, use /execute as (player) run script in (module) run ... + * for each player independently. In global mode - all global values and stored functions are shared among all players. + * To access specific player data with commandblocks, use /execute as (player) run script in (app) run ... * To access global/server state, you need to disown the command from any player, so use a commandblock, or any arbitrary * entity: /execute as @e[type=bat,limit=1] run script in (module) globals for instance. *

- *

/script in <module> ...

- *

Allows to run normal /script commands in a specific module, like run, invoke,..., globals etc...

+ *

/script in <app> ...

+ *

Allows to run normal /script commands in a specific app, like run, invoke,..., globals etc...

*
*/ public void loadScriptsFromFilesCommand() diff --git a/src/main/java/carpet/script/Expression.java b/src/main/java/carpet/script/Expression.java index 0cab3df3..89994ce3 100644 --- a/src/main/java/carpet/script/Expression.java +++ b/src/main/java/carpet/script/Expression.java @@ -51,7 +51,7 @@ import static java.lang.Math.min; /** - *

Fundamental components of scarpet programming language (towards upcoming version 1.5).

+ *

Fundamental components of scarpet programming language (version 1.5).

* *

Scarpet (a.k.a. Carpet Script, or Script for Carpet) is a programming language designed to provide * the ability to write custom programs to run within Minecraft and @@ -205,10 +205,10 @@ import static java.lang.Math.min; * *

Code delivery, line indicators

*

Note that this should only apply to pasting your code to execute with commandblock. Scarpet recommends placing your - * code in packages (files with .sc extension that can be placed inside "/scripts" folder in the world files - * and loaded as a module with command /script load [package_name]. Scarpet modules loaded from disk should only + * code in apps (files with .sc extension that can be placed inside "/scripts" folder in the world files + * and loaded as a scarpet app with command /script load [app_name]. Scarpet apps loaded from disk should only * contain code, no need to start with "/script run" prefix

- *

The following is the code that could be provided in a foo.sc file located in world /scripts folder

+ *

The following is the code that could be provided in a foo.sc app file located in world /scripts folder

* * 
  * run_program() -> (

From fd59b826c30169245d536f94889b29ccdf48be53 Mon Sep 17 00:00:00 2001
From: gnembon 
Date: Sun, 20 Oct 2019 01:52:48 -0300
Subject: [PATCH 2/2] 1.2

---
 gradle.properties                              |   2 +-
 .../java/carpet/settings/CarpetSettings.java   |   2 +-
 src/main/resources/assets/carpet/icon.png      | Bin 453 -> 6328 bytes
 src/main/resources/fabric.mod.json             |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0e6d0046..ec5c973c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.4.8+build.158
 
 # Mod Properties
-	mod_version = 1.1.3+v191016
+	mod_version = 1.2.0+v191020
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 
diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java
index ad1c5222..abb48eb8 100644
--- a/src/main/java/carpet/settings/CarpetSettings.java
+++ b/src/main/java/carpet/settings/CarpetSettings.java
@@ -27,7 +27,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
 
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.1.3+v191016";
+    public static final String carpetVersion = "1.2.0+v191020";
     public static final Logger LOG = LogManager.getLogger();
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;
diff --git a/src/main/resources/assets/carpet/icon.png b/src/main/resources/assets/carpet/icon.png
index 047b91f2347de5cf95f23284476fddbe21ba23fe..9178b9612e5f6ca97a2f001c4d957cd8d6895332 100644
GIT binary patch
literal 6328
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

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 255ad3cc..ffa9a8cd 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "carpet",
-  "version": "1.1.3",
+  "version": "1.2.0",
 
   "name": "Carpet Mod in Fabric",
   "description": "Carpet made out of fabric",