Skip to content

Commit 9262896

Browse files
EcdcaebEcdcaeb
authored
Merge branch 'curseforge' into main__
2 parents be562a6 + 6c75bc4 commit 9262896

25 files changed

+109
-109
lines changed

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
### ShotaASM
1+
### ScriptASM
22

3-
<img src="https://github.com/Ecdcaeb/ShotaASM/blob/main/icon.png" alt="image" width="100" height="auto">
3+
<img src="https://github.com/Ecdcaeb/ScriptASM/blob/main/icon.png" alt="image" width="100" height="auto">
44

55
a script mod enables you write asm codes in scripts.
66

7-
Check [Wiki](https://github.com/Ecdcaeb/ShotaASM/wiki) for details.
7+
Check [Wiki](https://github.com/Ecdcaeb/ScriptASM/wiki) for details.
88

99
#### example :
1010

1111
```java
12-
#compiler javaShota
12+
#compiler javaScript
1313
#import org.apache.logging.log4j.LogManager
1414
#import org.apache.logging.log4j.Logger
1515

16-
System.out.print("Shota Strat his own tests!!! ^o^");
17-
final Logger LOGGER = LogManager.getLogger("Cute shota");
16+
System.out.print("Script Strat his own tests!!! ^o^");
17+
final Logger LOGGER = LogManager.getLogger("Cute script");
1818
LOGGER.info("Now, i have my own logger!!");
1919

2020
// Change the title
@@ -23,8 +23,8 @@ TransformerRegistry.registerASMExplicitTransformer(-99 ,
2323
for (var mn :cn.methods) {
2424
var itr = mn.instructions.iterator();
2525
while (itr.hasNext()) {
26-
if (itr.next() instanceof LdcInsnNode ldc && ldc.cst instanceof String str && str.startsWith("Cleanroom")) {
27-
ldc.cst = str + " & Cute Shota";
26+
if (itr.next() instanceof LdcInsnNode ldc && ldc.cst instanceof String str && str.startsWith("Cleanroom Loader")) {
27+
ldc.cst = str + " & Cute Script";
2828
LOGGER.info("change the title to {}", ldc.cst);
2929
}
3030
}

‎gradle.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ enable_shadow = false
1616
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
1717
mod_version = 1.1
1818
root_package = mods.Hileb
19-
mod_id = shotaasm
20-
mod_name = ShotaASM
19+
mod_id = scriptasm
20+
mod_name = ScriptASM
2121

2222
# Mod Metadata (Optional)
2323
mod_description =a script mod enables you write asm codes in scripts
24-
mod_url =https://github.com/Ecdcaeb/ShotaASM
24+
mod_url =https://github.com/Ecdcaeb/ScriptASM
2525
mod_update_json =
2626
# Delimit authors with commas
2727
mod_authors =Hileb
@@ -66,7 +66,7 @@ access_transformer_locations = ${mod_id}_at.cfg
6666
# You MUST state a class name for `coremod_plugin_class_name` if you are making a coremod, the class should implement `IFMLLoadingPlugin`
6767
is_coremod = true
6868
coremod_includes_mod = true
69-
coremod_plugin_class_name = mods.Hileb.shotaasm.ShotaASM
69+
coremod_plugin_class_name = mods.Hileb.scriptasm.ScriptASM
7070

7171
# AssetMover
7272
# Convenient way to allow downloading of assets from official vanilla Minecraft servers, CurseForge, or any direct links

src/main/java/mods/Hileb/shotaasm/MetaDataDecoder.java renamed to src/main/java/mods/Hileb/scriptasm/MetaDataDecoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mods.Hileb.shotaasm;
1+
package mods.Hileb.scriptasm;
22

33
import com.google.gson.JsonArray;
44
import com.google.gson.JsonElement;

src/main/java/mods/Hileb/shotaasm/ShotaASM.java renamed to src/main/java/mods/Hileb/scriptasm/ScriptASM.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package mods.Hileb.shotaasm;
1+
package mods.Hileb.scriptasm;
22

33
import com.google.common.eventbus.EventBus;
44
import com.google.common.eventbus.Subscribe;
5-
import mods.Hileb.shotaasm.api.ShotaContext;
6-
import mods.Hileb.shotaasm.impl.ShotaCompiler;
7-
import mods.Hileb.shotaasm.impl.EventHandler;
5+
import mods.Hileb.scriptasm.api.ScriptContext;
6+
import mods.Hileb.scriptasm.impl.ScriptCompiler;
7+
import mods.Hileb.scriptasm.impl.EventHandler;
88
import net.minecraftforge.fml.common.LoadController;
99
import net.minecraftforge.fml.common.ModMetadata;
1010
import net.minecraftforge.fml.common.event.FMLStateEvent;
@@ -17,12 +17,12 @@
1717

1818
import java.io.File;
1919

20-
@IFMLLoadingPlugin.Name(ShotaASM.NAME)
20+
@IFMLLoadingPlugin.Name(ScriptASM.NAME)
2121
@IFMLLoadingPlugin.MCVersion(net.minecraftforge.common.ForgeVersion.mcVersion)
22-
public class ShotaASM implements IFMLLoadingPlugin {
22+
public class ScriptASM implements IFMLLoadingPlugin {
2323
public static final String NAME = Reference.MOD_NAME;
2424
public static final String MOD_ID = Reference.MOD_ID;
25-
public static final ModMetadata MOD_METADATA = MetaDataDecoder.decodeMcModInfo(ShotaASM.class.getResourceAsStream("/mcmod.info")).get(MOD_ID);
25+
public static final ModMetadata MOD_METADATA = MetaDataDecoder.decodeMcModInfo(ScriptASM.class.getResourceAsStream("/mcmod.info")).get(MOD_ID);
2626
public static final Logger LOGGER = LogManager.getLogger(NAME);
2727
public static boolean DEBUG = Boolean.parseBoolean(System.getProperty("foundation.dump", "false"));
2828

@@ -35,12 +35,12 @@ public String[] getASMTransformerClass() {
3535

3636
@Override
3737
public String getModContainerClass() {
38-
return "mods.Hileb.shotaasm.ShotaASM$Container";
38+
return "mods.Hileb.scriptasm.ScriptASM$Container";
3939
}
4040

4141
@Override
4242
public String getSetupClass() {
43-
return "mods.Hileb.shotaasm.ShotaASM$Setup";
43+
return "mods.Hileb.scriptasm.ScriptASM$Setup";
4444
}
4545

4646
@Override
@@ -84,7 +84,7 @@ public void injectData(Map<String,Object> data) {
8484
}
8585

8686
public Void call() {
87-
ShotaContext.initialize();
87+
ScriptContext.initialize();
8888
ScriptLoader.initialize();
8989
ScriptLoader.loadScripts().forEach(Runnable::run);
9090
return null;

src/main/java/mods/Hileb/shotaasm/ScriptLoader.java renamed to src/main/java/mods/Hileb/scriptasm/ScriptLoader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package mods.Hileb.shotaasm;
1+
package mods.Hileb.scriptasm;
22

33
import com.google.common.collect.Iterables;
4-
import mods.Hileb.shotaasm.api.IScriptCompiler;
5-
import mods.Hileb.shotaasm.api.IScriptLocator;
4+
import mods.Hileb.scriptasm.api.IScriptCompiler;
5+
import mods.Hileb.scriptasm.api.IScriptLocator;
66
import net.minecraft.launchwrapper.Launch;
77

88
import java.io.BufferedReader;

src/main/java/mods/Hileb/shotaasm/api/IScriptCompiler.java renamed to src/main/java/mods/Hileb/scriptasm/api/IScriptCompiler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mods.Hileb.shotaasm.api;
1+
package mods.Hileb.scriptasm.api;
22

33
public interface IScriptCompiler {
44
String name();

src/main/java/mods/Hileb/shotaasm/api/IScriptLocator.java renamed to src/main/java/mods/Hileb/scriptasm/api/IScriptLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mods.Hileb.shotaasm.api;
1+
package mods.Hileb.scriptasm.api;
22

33
import java.util.Collection;
44

src/main/java/mods/Hileb/shotaasm/api/ShotaContext.java renamed to src/main/java/mods/Hileb/scriptasm/api/ScriptContext.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package mods.Hileb.shotaasm.api;
1+
package mods.Hileb.scriptasm.api;
22

3-
public class ShotaContext {
3+
public class ScriptContext {
44
public static void initialize() {}
55

66
public static boolean isClassExist(String name) {
77
return net.minecraft.launchwrapper.Launch.classLoader.isClassExist(name);
88
}
99

1010
public static java.util.Set<String> supportedCompilers() {
11-
return mods.Hileb.shotaasm.ScriptLoader.compilers.keySet();
11+
return mods.Hileb.scriptasm.ScriptLoader.compilers.keySet();
1212
}
1313
}

src/main/java/mods/Hileb/shotaasm/api/ScriptFile.java renamed to src/main/java/mods/Hileb/scriptasm/api/ScriptFile.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package mods.Hileb.shotaasm.api;
1+
package mods.Hileb.scriptasm.api;
22

3-
import mods.Hileb.shotaasm.ShotaASM;
3+
import mods.Hileb.scriptasm.ScriptASM;
44
import com.google.common.collect.HashMultimap;
55
import com.google.common.collect.Multimap;
66
import org.apache.commons.io.IOUtils;
@@ -44,17 +44,17 @@ public static ScriptFile create(String name, String rawText) {
4444
}
4545
}
4646
if (!map.containsKey("compiler")) {
47-
map.put("compiler", "javaShota");
47+
map.put("compiler", "javaScript");
4848
}
4949

50-
if (ShotaASM.DEBUG) {
51-
ShotaASM.LOGGER.info("Script Debug : {}", name);
52-
ShotaASM.LOGGER.info("Processed Text : \n {}", nonCommentText.toString());
50+
if (ScriptASM.DEBUG) {
51+
ScriptASM.LOGGER.info("Script Debug : {}", name);
52+
ScriptASM.LOGGER.info("Processed Text : \n {}", nonCommentText.toString());
5353
}
5454

5555
return new ScriptFile(name, nonCommentText.toString(), map, new HashMap<>());
5656
} catch (Exception e) {
57-
ShotaASM.LOGGER.error("Error creating ScriptFile for '{}': {}", name, e.getMessage(), e);
57+
ScriptASM.LOGGER.error("Error creating ScriptFile for '{}': {}", name, e.getMessage(), e);
5858
return null;
5959
}
6060
}

src/main/java/mods/Hileb/shotaasm/api/TransformerRegistry.java renamed to src/main/java/mods/Hileb/scriptasm/api/TransformerRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mods.Hileb.shotaasm.api;
1+
package mods.Hileb.scriptasm.api;
22

33

44
import top.outlands.foundation.TransformerDelegate;

0 commit comments

Comments
 (0)