Skip to content

Commit

Permalink
0.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
0999312 committed Dec 25, 2022
1 parent ef957ac commit 3a993c6
Show file tree
Hide file tree
Showing 170 changed files with 13,204 additions and 691 deletions.
33 changes: 25 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@ buildscript {
repositories {
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
maven { url = 'https://maven.minecraftforge.net' }
maven { url = 'https://maven.parchmentmc.org' }
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath 'org.parchmentmc:librarian:1.+'
}
}
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
plugins {
id 'eclipse'
id 'maven-publish'
}
apply plugin: 'net.minecraftforge.gradle'

apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'

version = '1.0'
version = '0.0.2'
group = 'net.tracen' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'umapyoi'

Expand All @@ -25,13 +28,14 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)

println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
minecraft {
mappings channel: 'official', version: '1.18.2'
mappings channel: 'parchment', version: '1.18.2-2022.08.07-1.18.2'
runs {
client {
workingDirectory project.file('run')

property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug'
properties 'mixin.env.disableRefMap': 'true'
property 'forge.enabledGameTestNamespaces', 'umapyoi'

mods {
Expand All @@ -46,6 +50,7 @@ minecraft {

property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug'
properties 'mixin.env.disableRefMap': 'true'
property 'forge.enabledGameTestNamespaces', 'umapyoi'

mods {
Expand All @@ -60,6 +65,7 @@ minecraft {

property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug'
properties 'mixin.env.disableRefMap': 'true'
property 'forge.enabledGameTestNamespaces', 'umapyoi'

mods {
Expand All @@ -73,7 +79,7 @@ minecraft {
workingDirectory project.file('run')

property 'forge.logging.markers', 'REGISTRIES'

properties 'mixin.env.disableRefMap': 'true'
property 'forge.logging.console.level', 'debug'

// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
Expand All @@ -99,6 +105,11 @@ repositories {
maven {
url = "https://maven.theillusivec4.top/"
}

// JEI, Tinker's Construct, Mantle, Iron Chests, Natura, etc.
maven { url = "https://dvs1.progwml6.com/files/maven" }
// Patchouli
maven { url = 'https://maven.blamejared.com' }
}

dependencies {
Expand All @@ -107,18 +118,24 @@ dependencies {
implementation fg.deobf("cn.mcmod_mmf.mmlib:MMLib:1.1.2-1.18.2")
runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.2-5.0.7.1")
compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.2-5.0.7.1:api")

compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-70")
runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.2-70")

compileOnly fg.deobf("mezz.jei:jei-1.18.2-forge:10.0.0.191")
runtimeOnly fg.deobf("mezz.jei:jei-1.18.2-forge:10.0.0.191")
}

// Example for how to get properties into the manifest for reading at runtime.
jar {
manifest {
attributes([
"Specification-Title" : "examplemod",
"Specification-Vendor" : "examplemodsareus",
"Specification-Version" : "1", // We are version 1 of ourselves
"Specification-Title" : "umapyoi",
"Specification-Vendor" : "tracen_minecraft_group",
"Specification-Version" : "0.0.2",
"Implementation-Title" : project.name,
"Implementation-Version" : project.jar.archiveVersion,
"Implementation-Vendor" : "examplemodsareus",
"Implementation-Vendor" : "tracen_minecraft_group",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
Expand Down
54 changes: 42 additions & 12 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
6db06799edb2866ed694bb097507ad953c7cb7a0 assets/umapyoi/lang/en_us.json
178d23c4d2101714416549c82f5931b85a1e8617 assets/umapyoi/blockstates/register_lectern.json
ebff119b2ac1cacd7053dc258796bbd74549d019 assets/umapyoi/blockstates/skill_learning_table.json
0e2b4b292fcbbc3bc4f5ddc14c27fdae809c74db assets/umapyoi/blockstates/three_goddess.json
ffbc473b97326bb3336fc0ccfc2ae6cf80a54083 assets/umapyoi/blockstates/training_facility.json
e1f90bff845b39b0d92a0ff4bc29360750aa05b6 assets/umapyoi/lang/en_us.json
5e693d68b9c3cc94971021fb7451115324791483 assets/umapyoi/models/item/blank_uma_soul.json
2af16e6bbbfd4398358135c8a9655bcc0be240bd assets/umapyoi/models/item/cupcake.json
2796108c5ea01ab5517ddee33843a47a1a6d5a5a assets/umapyoi/models/item/jewel.json
5178fdb14009ac939f062144136a5bd972cc4e64 assets/umapyoi/models/item/mentality_high_item.json
eb80a922060816fc71d366643354a164a95f1ee7 assets/umapyoi/models/item/mentality_low_item.json
83afdb2d1ef26e8bb4d14e1307d180eccfba5fd9 assets/umapyoi/models/item/mentality_mid_item.json
6fab5b63d54d77b0532b6868a101794bc0ee4e04 assets/umapyoi/models/item/register_lectern.json
7e22825f52670bff9da27468b6b6458d1211dea9 assets/umapyoi/models/item/royal_bitter.json
1aea81061d3f88d8450d6a54485c8652222d75a3 assets/umapyoi/models/item/skill_book.json
1f7aa1b3be6f01e73600b5b614860cf6fdbff426 assets/umapyoi/models/item/skill_learning_table.json
9acdb055f4504020cb0ad44b8711271ef9342558 assets/umapyoi/models/item/speed_high_item.json
13e4a0895f6c7d47c4a3d857a80573c96d09c510 assets/umapyoi/models/item/speed_low_item.json
26772dd89a7cb6cb6825a15f0baba16e8fc24ef5 assets/umapyoi/models/item/speed_mid_item.json
Expand All @@ -17,20 +24,43 @@ f9a546677d1bdf870682b644350f7644deb78318 assets/umapyoi/models/item/strength_low
fc94516a8f0e4cd73180fb1f9496f340947fe3da assets/umapyoi/models/item/strength_mid_item.json
5497be6995b06169bb547a09ead50f23cfe8c239 assets/umapyoi/models/item/summer_uniform.json
d622d8f1d2ef7c80f28694eb8210aecdcb943a1c assets/umapyoi/models/item/sweet_cupcake.json
a2fedf50283fa1cfc7174d9cea1317486f534f47 assets/umapyoi/models/item/three_goddess.json
188c47a2b578bb8eb0e2730bbabced25370c6eba assets/umapyoi/models/item/training_facility.json
a493e606f98c0d9e86193297208bb3269d914114 assets/umapyoi/models/item/trainning_suit.json
294a2cb1d5612a441a893eff321a61eecaf6b129 assets/umapyoi/models/item/uma_factor_item.json
76a71ccb0df2acb249495c8815b79c13cd123c90 assets/umapyoi/models/item/uma_soul.json
a42101efb66b79f2cf06a73647ccf1e37fb9978f assets/umapyoi/models/item/winter_uniform.json
d9657d619cd02752ac6e55cbcddd0b8a7b959531 assets/umapyoi/models/item/wisdom_high_item.json
03f7f7e3294c61aa2519a3aa6af98e74d2168f27 assets/umapyoi/models/item/wisdom_low_item.json
b0ec2a3b6ce61f4174cd61031797994ba5cb6c7a assets/umapyoi/models/item/wisdom_mid_item.json
f753439c558e9415a3d7196b46128d14cea5c9b1 data/umapyoi/tags/blocks/road/dirf.json
d832deb0575003b6460c716b8fcc17652e74148f data/umapyoi/tags/blocks/road/snow.json
ba6c56b69283bdcb1ad1a1220bcd8c8d7d9665fc data/umapyoi/tags/blocks/road/turf.json
0cc51e620f2a814e9211d0ebbdf91af25fc7cc91 data/umapyoi/umapyoi/umadata/agnus_tachyon.json
6ddc80381edbe222fae5738dae5286d2ad8e3534 data/umapyoi/umapyoi/umadata/gold_ship.json
444ef5032b30fc40ab417852e5847c3ea6726240 data/umapyoi/umapyoi/umadata/haru_urara.json
82dc4737415782fc7c1c431c376e7360900df337 data/umapyoi/umapyoi/umadata/oguri_cap.json
1c7aa719da57bda4dd009d8bacc046e1fa60d320 data/umapyoi/umapyoi/umadata/oguri_cap_xmas.json
269ddd68fa469869fced9b3f5efc922896e00a48 data/umapyoi/umapyoi/umadata/sakura_sayono_o.json
72f6aeadc8b4923adc4212c70cae5930db157881 data/umapyoi/umapyoi/umadata/special_week.json
d4bfc229df9369e9f7ceb9056d9f2ba532cb6a11 data/umapyoi/umapyoi/umadata/tokai_teio.json
bdfea16231218b582edd20796970bfda85f229a7 data/umapyoi/advancements/recipes/umapyoi/jewel.json
13eb35bd281e719c1947615d57046540b36f3343 data/umapyoi/advancements/recipes/umapyoi/register_lectern.json
f91cebf7ffff3e81f02d76716e4c2d3c70912fa3 data/umapyoi/advancements/recipes/umapyoi/skill_learning_table.json
393f4b72686e5eba5929363b9080f608adcdfaa2 data/umapyoi/advancements/recipes/umapyoi/summer_uniform.json
8dc225450379ad5603d72ce280bc7ae5ede00d6a data/umapyoi/advancements/recipes/umapyoi/three_goddess.json
76d1b56efd01da9278b03599d712e99bbd0de6ae data/umapyoi/advancements/recipes/umapyoi/training_facility.json
e4c04ffb89086224fbfa3caf3447ecdd28a8a25e data/umapyoi/advancements/recipes/umapyoi/trainning_suit.json
2d6e34c18cd636a69d21d40f24b8d72c95c093f6 data/umapyoi/advancements/recipes/umapyoi/winter_uniform.json
6b0fb4d774cd6bb0835cff45060bad67907d855d data/umapyoi/recipes/jewel.json
996fd8f75f35b2cf1fcabca740c8fbd774e2ed71 data/umapyoi/recipes/register_lectern.json
858a7d45faeb1d2f3094a7d3b7829d05a40cee02 data/umapyoi/recipes/skill_learning_table.json
23e7c05d7a0a4591498fa7c0e04c116bec240b9b data/umapyoi/recipes/summer_uniform.json
508cf92b2b04bd8f1c184826d60229776a204ff7 data/umapyoi/recipes/three_goddess.json
593dd232685905fac65cf3751dbaae7a9ba0a95f data/umapyoi/recipes/training_facility.json
5c69e17736ae8b1a14af960ed8ba4cea59752098 data/umapyoi/recipes/trainning_suit.json
35a36d14cdccc32bf05a9e2249a05e709e462aa5 data/umapyoi/recipes/winter_uniform.json
2c5e95d43ae8e40438cd1973cf9bb17260ae5e9a data/umapyoi/umapyoi/umadata/agnus_tachyon.json
71f365dc52903a67c2bb115ae780ec937c1bbcc3 data/umapyoi/umapyoi/umadata/common_uma.json
0f6752c79335de9e58847aae1b73c0a2c0227e8f data/umapyoi/umapyoi/umadata/gold_ship.json
54f94f9576e7f31f0679928356b2910eda7951e2 data/umapyoi/umapyoi/umadata/haru_urara.json
6e1fceade4a5b5836969410547169554840e0cbe data/umapyoi/umapyoi/umadata/matikanefukukitaru.json
09f4967d297cce6f7f86f57153a54861d2cad103 data/umapyoi/umapyoi/umadata/oguri_cap.json
a784a28d5baf3d66d1de18ce8a6f46d804771aad data/umapyoi/umapyoi/umadata/oguri_cap_xmas.json
1d0e98384b1b0d9dabc054085eea7c8aa1f3f614 data/umapyoi/umapyoi/umadata/rice_shower.json
d4b95bf37d1bfb8b3690ba69e7276d97108b9688 data/umapyoi/umapyoi/umadata/sakura_bakushin_o.json
1ea1730e63e4ea79c5d0d6a3a6aaa3b4cfece219 data/umapyoi/umapyoi/umadata/sakura_sayono_o.json
a58c7457dae1ab5013b4d7e6d703dc9ea9993cbe data/umapyoi/umapyoi/umadata/seiun_sky.json
f1fd9aee981708f076b71ea943a6c58964d25cdd data/umapyoi/umapyoi/umadata/special_week.json
711f3dd15d74eb2e4fc5595425530746f3ebf218 data/umapyoi/umapyoi/umadata/tamamo_cross.json
bd006c66fda4137c6b642c941714e41f7e8ad818 data/umapyoi/umapyoi/umadata/tokai_teio.json
bd68c4f7529c4a1819fc7e7fe0c453669b79f786 data/umapyoi/umapyoi/umadata/vodka.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=north": {
"model": "umapyoi:block/register_lectern"
},
"facing=south": {
"model": "umapyoi:block/register_lectern",
"y": 180
},
"facing=west": {
"model": "umapyoi:block/register_lectern",
"y": 270
},
"facing=east": {
"model": "umapyoi:block/register_lectern",
"y": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "umapyoi:block/skill_learning_table"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=north": {
"model": "umapyoi:block/three_goddess"
},
"facing=south": {
"model": "umapyoi:block/three_goddess",
"y": 180
},
"facing=west": {
"model": "umapyoi:block/three_goddess",
"y": 270
},
"facing=east": {
"model": "umapyoi:block/three_goddess",
"y": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=north": {
"model": "umapyoi:block/training_facility"
},
"facing=south": {
"model": "umapyoi:block/training_facility",
"y": 180
},
"facing=west": {
"model": "umapyoi:block/training_facility",
"y": 270
},
"facing=east": {
"model": "umapyoi:block/training_facility",
"y": 90
}
}
}
71 changes: 61 additions & 10 deletions src/generated/resources/assets/umapyoi/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{
"block.umapyoi.register_lectern": "Retire Register Lectern",
"block.umapyoi.skill_learning_table": "Skill Learning Table",
"block.umapyoi.three_goddess": "Three Goddesses Statue",
"block.umapyoi.training_facility": "Training Facility",
"container.umapyoi.retire_register": "Retire Register",
"container.umapyoi.skill_learning": "Skill Learning Table",
"container.umapyoi.three_goddess": "Three Goddesses Statue",
"container.umapyoi.training_facility": "Training Facility",
"curios.identifier.uma_soul": "Umamusume Soul",
"curios.identifier.uma_suit": "Umamusume Apparel",
"curios.modifiers.uma_soul": "When being umamusume:",
"curios.modifiers.uma_suit": "When wearing apparel:",
"item.umapyoi.blank_uma_soul": "Blank Umamusume Soul",
"item.umapyoi.cupcake": "Plain Cupcake",
"item.umapyoi.hachimi_big": "Hachimi Extreme",
Expand All @@ -10,6 +20,7 @@
"item.umapyoi.mentality_low_item": "Guts Notepad",
"item.umapyoi.mentality_mid_item": "Guts Writings",
"item.umapyoi.royal_bitter": "Royal BitterJuice",
"item.umapyoi.skill_book": "Skill Book",
"item.umapyoi.speed_high_item": "Speed Scroll",
"item.umapyoi.speed_low_item": "Speed Notepad",
"item.umapyoi.speed_mid_item": "Speed Writings",
Expand All @@ -22,20 +33,60 @@
"item.umapyoi.summer_uniform": "Tracen Summer Uniform",
"item.umapyoi.sweet_cupcake": "Sweet Cupcake",
"item.umapyoi.trainning_suit": "Tracen Training Suit",
"item.umapyoi.uma_factor_item": "Umamusume Wish",
"item.umapyoi.uma_soul": "Umamusume Soul",
"item.umapyoi.winter_uniform": "Tracen Winter Uniform",
"item.umapyoi.wisdom_high_item": "Wisdom Scroll",
"item.umapyoi.wisdom_low_item": "Wisdom Notepad",
"item.umapyoi.wisdom_mid_item": "Wisdom Writings",
"itemGroup.umapyoi": "Umapyoi",
"tooltip.umapyoi.uma.agnus_tachyon": "Agnus Tachyon",
"tooltip.umapyoi.uma.common_uma": "Nameless Umamusume",
"tooltip.umapyoi.uma.gold_ship": "Gold Ship",
"tooltip.umapyoi.uma.haru_urara": "Haru Urara",
"tooltip.umapyoi.uma.oguri_cap": "Oguri Cap",
"tooltip.umapyoi.uma.oguri_cap_xmas": "[Miraculous White Star] Oguri Cap",
"tooltip.umapyoi.uma.sakura_sayono_o": "Sakura Chiyono O",
"tooltip.umapyoi.uma.special_week": "Special Week",
"tooltip.umapyoi.uma.tokai_teio": "Tokai Teio",
"tooltip.umapyoi.umadata.name": "Umamusume's Name:%s"
"support.umapyoi.guts_support": "Guts Increase",
"support.umapyoi.skill_support": "Learning Skill",
"support.umapyoi.speed_support": "Speed Increase",
"support.umapyoi.stamina_support": "Stamina Increase",
"support.umapyoi.strength_support": "Strength Increase",
"support.umapyoi.wisdom_support": "Wisdom Increase",
"tooltip.umapyoi.umadata.name": "Umamusume's Name:%s",
"tooltip.umapyoi.umafactor.data": "Has %s and %d more factors.",
"uma_factor.umapyoi.guts_factor": "Guts Factor",
"uma_factor.umapyoi.speed_factor": "Speed Factor",
"uma_factor.umapyoi.stamina_factor": "Stamina Factor",
"uma_factor.umapyoi.strength_factor": "Strength Factor",
"uma_factor.umapyoi.wisdom_factor": "Wisdom Factor",
"uma_skill.umapyoi.basic_pace": "Basic Pace",
"uma_skill.umapyoi.cooldown": "Cooldown",
"uma_skill.umapyoi.deep_breaths": "Deep Breaths",
"uma_skill.umapyoi.heart_and_soul": "Heart and Soul",
"uma_skill.umapyoi.last_leg": "Last Leg",
"umadata.umapyoi.agnus_tachyon": "Agnus Tachyon",
"umadata.umapyoi.common_uma": "Nameless Umamusume",
"umadata.umapyoi.gold_ship": "Gold Ship",
"umadata.umapyoi.haru_urara": "Haru Urara",
"umadata.umapyoi.matikanefukukitaru": "Matikane Fukukitaru",
"umadata.umapyoi.oguri_cap": "Oguri Cap",
"umadata.umapyoi.oguri_cap_xmas": "[Miraculous White Star] Oguri Cap",
"umadata.umapyoi.rice_shower": "Rice Shower",
"umadata.umapyoi.sakura_bakushin_o": "Sakura Bakushin O",
"umadata.umapyoi.sakura_sayono_o": "Sakura Chiyono O",
"umadata.umapyoi.seiun_sky": "Seiun Sky",
"umadata.umapyoi.special_week": "Special Week",
"umadata.umapyoi.tamamo_cross": "Tamamo Cross",
"umadata.umapyoi.tokai_teio": "Tokai Teio",
"umadata.umapyoi.vodka": "Vodka",
"umapyoi.skill.no_require": "Nothing required.",
"umapyoi.skill.require_wisdom": "%s wisdom required.",
"umapyoi.skill_not_ready": "Skill is not ready, %d seconds remaining.",
"umastatus.level.0": "G-",
"umastatus.level.1": "G",
"umastatus.level.10": "S+",
"umastatus.level.11": "SS",
"umastatus.level.12": "SS+",
"umastatus.level.2": "F",
"umastatus.level.3": "E",
"umastatus.level.4": "D",
"umastatus.level.5": "C",
"umastatus.level.6": "B",
"umastatus.level.7": "A",
"umastatus.level.8": "A+",
"umastatus.level.9": "S"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "umapyoi:block/register_lectern"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "umapyoi:item/skill_book"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "umapyoi:block/skill_learning_table"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "umapyoi:item/three_goddess"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "umapyoi:block/training_facility"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "umapyoi:item/uma_factor_item"
}
}
Loading

0 comments on commit 3a993c6

Please sign in to comment.