Skip to content

add zip args parser #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
12rcu wants to merge 2 commits into
base: main
Choose a base branch
from
Open

add zip args parser #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7146281
add zip args parser
12rcu Aug 29, 2024
765d74f
Merge branch 'main' into feature/parse-zip-args
12rcu Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/com/lop/devtools/monstera/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,9 @@ class MinecraftAddonPaths(

class MinecraftFormatVersions(
var behEntity: String = "1.20.81",
var behItem: String = "1.10.0",
var behItem: String = "1.20.50",
var behAnim: String = "1.8.0",
var behBlock: String = "1.20.81",
var behBlock: String = "1.20.60",
var behRecipe: String = "1.17.41",
var behSpawnRule: String = "1.8.0",
var behAnimController: String = "1.10.0",
Expand Down
11 changes: 11 additions & 0 deletions src/main/kotlin/com/lop/devtools/monstera/addon/Addon.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.lop.devtools.monstera.addon.block.Block
import com.lop.devtools.monstera.addon.dev.buildToMcFolder
import com.lop.devtools.monstera.addon.dev.overwriteResourceInMcFolder
import com.lop.devtools.monstera.addon.dev.validateTextures
import com.lop.devtools.monstera.addon.dev.zipper.zipWorld
import com.lop.devtools.monstera.addon.entity.Entity
import com.lop.devtools.monstera.addon.item.Item
import com.lop.devtools.monstera.addon.mcfunction.McFunction
Expand Down Expand Up @@ -322,6 +323,16 @@ open class Addon(val config: Config, val args: Array<String>) {
onPackage.forEach {
it.invoke(this)
}

when(argParsed["zipworld"]) {
null, "true" -> zipWorld(config)
else -> zipWorld(config, argParsed["zipworld"]!!)
}

when(argParsed["zipaddon"]) {
null, "true" -> zipWorld(config)
else -> zipWorld(config, argParsed["zipaddon"]!!)
}
}
}

Expand Down
19 changes: 18 additions & 1 deletion src/main/kotlin/com/lop/devtools/monstera/files/beh/item/comp/ItemEnchantable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,57 @@ class ItemEnchantable : MonsteraRawFile() {
}

enum class EnchantableSlot {
@SerializedName("armor_feet")
@SerializedName("armor_feet")
ARMOR_FEET,

@SerializedName("armor_torso")
ARMOR_TORSO,

@SerializedName("armor_head")
ARMOR_HEAD,

@SerializedName("armor_legs")
ARMOR_LEGS,

@SerializedName("armor_axe")
AXE,

@SerializedName("armor_bow")
BOW,

@SerializedName("cosmetic_head")
COSMETIC_HEAD,

@SerializedName("crossbow")
CROSSBOW,

@SerializedName("elytra")
ELYTRA,

@SerializedName("fishing_rod")
FISHING_ROD,

@SerializedName("flintsteel")
FLINTSTEEL,

@SerializedName("hoe")
HOE,

@SerializedName("pickaxe")
PICKAXE,

@SerializedName("shears")
SHEARS,

@SerializedName("shield")
SHIELD,

@SerializedName("shovel")
SHOVEL,

@SerializedName("sword")
SWORD,

@SerializedName("all")
ALL;

Expand Down