Upload additional files
-
Used for files such as sources or Javadocs.
+
+ Used for additional files such as required/optional resource packs
+
+
Used for files such as sources or Javadocs.
@@ -629,6 +777,7 @@ import Multiselect from 'vue-multiselect'
import {
acceptFileFromProjectType,
inferVersionInfo,
+ createDataPackVersion,
} from '~/plugins/fileUtils'
import VersionBadge from '~/components/ui/Badge'
@@ -654,9 +803,13 @@ import PlusIcon from '~/assets/images/utils/plus.svg?inline'
import TransferIcon from '~/assets/images/utils/transfer.svg?inline'
import UploadIcon from '~/assets/images/utils/upload.svg?inline'
import BackIcon from '~/assets/images/utils/left-arrow.svg?inline'
+import BoxIcon from '~/assets/images/utils/box.svg?inline'
+import RightArrowIcon from '~/assets/images/utils/right-arrow.svg?inline'
+import Modal from '~/components/ui/Modal.vue'
export default {
components: {
+ Modal,
FileInput,
Checkbox,
Chips,
@@ -680,6 +833,8 @@ export default {
ModalConfirm,
ModalReport,
Multiselect,
+ BoxIcon,
+ RightArrowIcon,
},
props: {
project: {
@@ -722,6 +877,7 @@ export default {
data() {
return {
primaryFile: {},
+ alternateFile: {},
version: {},
isEditing: false,
@@ -738,6 +894,21 @@ export default {
deleteFiles: [],
replaceFile: null,
+ newFileTypes: [],
+ oldFileTypes: [],
+ fileTypes: [
+ {
+ display: 'Required resource pack',
+ value: 'required-resource-pack',
+ },
+ {
+ display: 'Optional resource pack',
+ value: 'optional-resource-pack',
+ },
+ ],
+
+ packageLoaders: ['forge', 'fabric', 'quilt'],
+
showKnownErrors: false,
}
},
@@ -814,6 +985,7 @@ export default {
acceptFileFromProjectType,
reset() {
this.primaryFile = {}
+ this.alternateFile = {}
this.version = {}
this.changelogViewMode = 'source'
@@ -827,10 +999,14 @@ export default {
this.newFiles = []
this.deleteFiles = []
this.replaceFile = null
+ this.oldFileTypes = []
+ this.newFileTypes = []
this.isEditing = false
this.isCreating = false
+ this.packageLoaders = ['forge', 'fabric', 'quilt']
+
this.showKnownErrors = false
},
async setVersion() {
@@ -916,6 +1092,9 @@ export default {
this.version = JSON.parse(JSON.stringify(this.version))
this.primaryFile =
this.version.files.find((file) => file.primary) ?? this.version.files[0]
+ this.alternateFile = this.version.files.find(
+ (file) => file.file_type && file.file_type.includes('resource-pack')
+ )
this.version.author_member = this.members.find(
(x) => x.user.id === this.version.author_id
@@ -948,6 +1127,10 @@ export default {
}`
: ''
}
+
+ this.oldFileTypes = this.version.files.map((x) =>
+ this.fileTypes.find((y) => y.value === x.file_type)
+ )
},
async addDependency(
dependencyAddMode,
@@ -1037,12 +1220,24 @@ export default {
if (this.newFiles.length > 0 || this.replaceFile) {
const formData = new FormData()
+ const fileParts = this.newFiles.map((f, idx) => `${f.name}-${idx}`)
- formData.append('data', JSON.stringify({}))
+ formData.append(
+ 'data',
+ JSON.stringify({
+ file_types: this.newFileTypes.reduce(
+ (acc, x, i) => ({
+ ...acc,
+ [fileParts[i]]: x ? x.value : null,
+ }),
+ {}
+ ),
+ })
+ )
for (let i = 0; i < this.newFiles.length; i++) {
formData.append(
- this.newFiles[i].name.concat('-' + i),
+ fileParts[i],
new Blob([this.newFiles[i]]),
this.newFiles[i].name
)
@@ -1079,6 +1274,13 @@ export default {
loaders: this.version.loaders,
primary_file: ['sha1', this.primaryFile.hashes.sha1],
featured: this.version.featured,
+ file_types: this.oldFileTypes.map((x, i) => {
+ return {
+ algorithm: 'sha1',
+ hash: this.version.files[i].hashes.sha1,
+ file_type: x ? x.value : null,
+ }
+ }),
},
this.$defaultHeaders()
)
@@ -1090,7 +1292,7 @@ export default {
)
}
- const [versions, featuredVersions] = (
+ const [versions, featuredVersions, dependencies] = (
await Promise.all([
this.$axios.get(
`project/${this.version.project_id}/version`,
@@ -1100,12 +1302,17 @@ export default {
`project/${this.version.project_id}/version?featured=true`,
this.$defaultHeaders()
),
+ this.$axios.get(
+ `project/${this.version.project_id}/dependencies`,
+ this.$defaultHeaders()
+ ),
])
).map((it) => it.data)
const newEditedVersions = this.$computeVersions(versions)
this.$emit('update:versions', newEditedVersions)
this.$emit('update:featuredVersions', featuredVersions)
+ this.$emit('update:dependencies', dependencies)
await this.$router.replace(
`/${this.project.project_type}/${
@@ -1128,7 +1335,6 @@ export default {
},
async createVersion() {
this.$nuxt.$loading.start()
-
if (this.fieldErrors) {
this.showKnownErrors = true
@@ -1136,6 +1342,21 @@ export default {
return
}
+ try {
+ await this.createVersionRaw(this.version)
+ } catch (err) {
+ this.$notify({
+ group: 'main',
+ title: 'An error occurred',
+ text: err.response ? err.response.data.description : err,
+ type: 'error',
+ })
+ window.scrollTo({ top: 0, behavior: 'smooth' })
+ }
+
+ this.$nuxt.$loading.finish()
+ },
+ async createVersionRaw(version) {
const formData = new FormData()
const fileParts = this.newFiles.map((f, idx) => `${f.name}-${idx}`)
@@ -1144,20 +1365,27 @@ export default {
}
if (this.project.project_type === 'resourcepack') {
- this.version.loaders = ['minecraft']
+ version.loaders = ['minecraft']
}
const newVersion = {
- project_id: this.version.project_id,
+ project_id: version.project_id,
file_parts: fileParts,
- version_number: this.version.version_number,
- version_title: this.version.name || this.version.version_number,
- version_body: this.version.changelog,
- dependencies: this.version.dependencies,
- game_versions: this.version.game_versions,
- loaders: this.version.loaders,
- release_channel: this.version.version_type,
- featured: this.version.featured,
+ version_number: version.version_number,
+ version_title: version.name || version.version_number,
+ version_body: version.changelog,
+ dependencies: version.dependencies,
+ game_versions: version.game_versions,
+ loaders: version.loaders,
+ release_channel: version.version_type,
+ featured: version.featured,
+ file_types: this.newFileTypes.reduce(
+ (acc, x, i) => ({
+ ...acc,
+ [fileParts[this.replaceFile ? i + 1 : i]]: x ? x.value : null,
+ }),
+ {}
+ ),
}
formData.append('data', JSON.stringify(newVersion))
@@ -1172,58 +1400,51 @@ export default {
for (let i = 0; i < this.newFiles.length; i++) {
formData.append(
- fileParts[i],
+ fileParts[this.replaceFile ? i + 1 : i],
new Blob([this.newFiles[i]]),
this.newFiles[i].name
)
}
- try {
- const data = (
- await this.$axios({
- url: 'version',
- method: 'POST',
- data: formData,
- headers: {
- 'Content-Type': 'multipart/form-data',
- Authorization: this.$auth.token,
- },
- })
- ).data
-
- const [versions, featuredVersions] = (
- await Promise.all([
- this.$axios.get(
- `project/${this.version.project_id}/version`,
- this.$defaultHeaders()
- ),
- this.$axios.get(
- `project/${this.version.project_id}/version?featured=true`,
- this.$defaultHeaders()
- ),
- ])
- ).map((it) => it.data)
-
- const newCreatedVersions = this.$computeVersions(versions)
- this.$emit('update:versions', newCreatedVersions)
- this.$emit('update:featuredVersions', featuredVersions)
-
- await this.$router.push(
- `/${this.project.project_type}/${
- this.project.slug ? this.project.slug : this.project.project_id
- }/version/${data.id}`
- )
- } catch (err) {
- this.$notify({
- group: 'main',
- title: 'An error occurred',
- text: err.response.data.description,
- type: 'error',
+ const data = (
+ await this.$axios({
+ url: 'version',
+ method: 'POST',
+ data: formData,
+ headers: {
+ 'Content-Type': 'multipart/form-data',
+ Authorization: this.$auth.token,
+ },
})
- window.scrollTo({ top: 0, behavior: 'smooth' })
- }
+ ).data
- this.$nuxt.$loading.finish()
+ const [versions, featuredVersions, dependencies] = (
+ await Promise.all([
+ this.$axios.get(
+ `project/${this.version.project_id}/version`,
+ this.$defaultHeaders()
+ ),
+ this.$axios.get(
+ `project/${this.version.project_id}/version?featured=true`,
+ this.$defaultHeaders()
+ ),
+ this.$axios.get(
+ `project/${this.version.project_id}/dependencies`,
+ this.$defaultHeaders()
+ ),
+ ])
+ ).map((it) => it.data)
+
+ const newCreatedVersions = this.$computeVersions(versions)
+ this.$emit('update:versions', newCreatedVersions)
+ this.$emit('update:featuredVersions', featuredVersions)
+ this.$emit('update:dependencies', dependencies)
+
+ await this.$router.push(
+ `/${this.project.project_type}/${
+ this.project.slug ? this.project.slug : this.project.project_id
+ }/version/${data.id}`
+ )
},
async deleteVersion() {
this.$nuxt.$loading.start()
@@ -1238,6 +1459,56 @@ export default {
)
this.$nuxt.$loading.finish()
},
+ async createDataPackVersion() {
+ this.$nuxt.$loading.start()
+ try {
+ const blob = await createDataPackVersion(
+ this.project,
+ this.version,
+ this.primaryFile,
+ this.members,
+ this.$tag.gameVersions,
+ this.packageLoaders
+ )
+
+ this.newFiles = []
+ this.newFileTypes = []
+ this.replaceFile = new File(
+ [blob],
+ `${this.project.slug}-${this.version.version_number}.jar`
+ )
+
+ await this.createVersionRaw({
+ project_id: this.project.id,
+ author_id: this.currentMember.user.id,
+ name: this.version.name,
+ version_number: `${this.version.version_number}+mod`,
+ changelog: this.version.changelog,
+ version_type: this.version.version_type,
+ dependencies: this.version.dependencies,
+ game_versions: this.version.game_versions,
+ loaders: this.packageLoaders,
+ featured: this.version.featured,
+ })
+
+ this.$refs.modal_package_mod.hide()
+
+ this.$notify({
+ group: 'main',
+ title: 'Packaging Success',
+ text: 'Your data pack was successfully packaged as a mod! Make sure to playtest to check for errors.',
+ type: 'success',
+ })
+ } catch (err) {
+ this.$notify({
+ group: 'main',
+ title: 'An error occurred',
+ text: err.response ? err.response.data.description : err,
+ type: 'error',
+ })
+ }
+ this.$nuxt.$loading.finish()
+ },
},
}
@@ -1383,8 +1654,7 @@ export default {
}
.filename {
- word-wrap: break-word;
- overflow-wrap: anywhere;
+ word-wrap: anywhere;
}
.file-size {
@@ -1392,6 +1662,19 @@ export default {
white-space: nowrap;
}
+ .file-type {
+ font-style: italic;
+ font-weight: 300;
+ }
+
+ .raised-multiselect {
+ display: none;
+ margin: 0 0.5rem;
+ height: 40px;
+ max-height: 40px;
+ min-width: 235px;
+ }
+
.iconified-button {
margin-left: auto;
}
@@ -1399,6 +1682,13 @@ export default {
&:not(:nth-child(2)) {
margin-top: 0.5rem;
}
+
+ // TODO: Make file type editing work on mobile
+ @media (min-width: 600px) {
+ .raised-multiselect {
+ display: block;
+ }
+ }
}
.additional-files {
@@ -1454,4 +1744,23 @@ export default {
.separator {
margin: var(--spacing-card-sm) 0;
}
+
+.modal-package-mod {
+ padding: var(--spacing-card-bg);
+ display: flex;
+ flex-direction: column;
+
+ .markdown-body {
+ margin-bottom: 1rem;
+ }
+
+ .multiselect {
+ max-width: 20rem;
+ }
+
+ .button-group {
+ margin-left: auto;
+ margin-top: 1.5rem;
+ }
+}
diff --git a/pages/about.vue b/pages/about.vue
deleted file mode 100644
index a1f1ed071..000000000
--- a/pages/about.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
About
-
- Founded in 2020, Modrinth was created to provide modders with an open
- and intuitive platform to publish their projects on.
-
-
-
- Our primary goal is to be as open as possible, with all our code being
-
- open source, while giving back to the modding community as much as possible.
-
-
-
- While we still are in beta, we hope we can be a major modding platform
- for all modders.
-
-
How does Modrinth work?
-
- Modrinth is not just a website: it is made of several different
- components that all come together to make a fast and flexible modding
- platform.
-
-
-
- On the technical level, Modrinth is made up of two main components: the
- Rust-based backend named
- Labrinth, and the Vue-based frontend named
-
- Knossos.
-
-
-
- Additionally, some other custom-created resources exist, including but
- not limited to:
- Minotaur, a Gradle plugin for easily publishing mods to Modrinth, and
-
- Minos, an authentication provider. All of Modrinth's code can be found on
- our GitHub page.
-
-
Backend Documentation
-
- Documentation for the Modrinth API (Labrinth) can be found on the GitHub
- repository's wiki
- here.
-
-
-
-
-
-
-
diff --git a/pages/moderation.vue b/pages/moderation.vue
index 22ba8bea4..1f7df44b8 100644
--- a/pages/moderation.vue
+++ b/pages/moderation.vue
@@ -126,7 +126,7 @@
{{ item.item_type }}
- {{ item.item_id }}
+ {{ item.item_id }}
reported by
{{ item.reporter }}
diff --git a/pages/search.vue b/pages/search.vue
index 0de0cd7bd..f5fa625f3 100644
--- a/pages/search.vue
+++ b/pages/search.vue
@@ -78,7 +78,9 @@
@@ -376,6 +380,9 @@
:categories="result.display_categories"
:search="true"
:show-updated-date="sortType.name !== 'newest'"
+ :hide-loaders="
+ ['resourcepack', 'datapack'].includes(projectType.id)
+ "
/>
No results found for your query!
@@ -714,6 +721,12 @@ export default {
(x) => `categories:'${encodeURIComponent(x)}'`
)
)
+ } else if (this.projectType.id === 'datapack') {
+ formattedFacets.push(
+ this.$tag.loaderData.dataPackLoaders.map(
+ (x) => `categories:'${encodeURIComponent(x)}'`
+ )
+ )
}
if (this.selectedVersions.length > 0) {
diff --git a/pages/search/datapacks.vue b/pages/search/datapacks.vue
new file mode 100644
index 000000000..204f14812
--- /dev/null
+++ b/pages/search/datapacks.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index e5c83a2c7..4db45052c 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -161,6 +161,7 @@ export default {
resourcepack: 'gallery',
modpack: 'list',
shader: 'gallery',
+ datapack: 'list',
user: 'list',
},
}
diff --git a/pages/user/_id.vue b/pages/user/_id.vue
index 6ef1be06f..509e15fb1 100644
--- a/pages/user/_id.vue
+++ b/pages/user/_id.vue
@@ -160,7 +160,7 @@
},
...projectTypes.map((x) => {
return {
- label: x === 'resourcepack' ? 'Resource Packs' : x + 's',
+ label: $formatProjectType(x) + 's',
href: x,
}
}),
@@ -326,13 +326,47 @@ export default {
}
let gitHubUser = {}
-
+ let versions = []
try {
- gitHubUser = (
- await data.$axios.get(`https://api.github.com/user/` + user.github_id)
- ).data
+ const [gitHubUserData, versionsData] = (
+ await Promise.all([
+ data.$axios.get(`https://api.github.com/user/` + user.github_id),
+ data.$axios.get(
+ `versions?ids=${JSON.stringify(
+ [].concat.apply(
+ [],
+ projects.map((x) => x.versions)
+ )
+ )}`
+ ),
+ ])
+ ).map((it) => it.data)
+ gitHubUser = gitHubUserData
+ versions = versionsData
} catch {}
+ for (const version of versions) {
+ const projectIndex = projects.findIndex(
+ (x) => x.id === version.project_id
+ )
+ if (projects[projectIndex].loaders) {
+ for (const loader of version.loaders) {
+ if (!projects[projectIndex].loaders.includes(loader)) {
+ projects[projectIndex].loaders.push(loader)
+ }
+ }
+ } else {
+ projects[projectIndex].loaders = version.loaders
+ }
+ }
+ for (const project of projects) {
+ project.categories = project.categories.concat(project.loaders)
+ project.project_type = data.$getProjectTypeForUrl(
+ project.project_type,
+ project.categories
+ )
+ }
+
return {
user,
projects,
diff --git a/plugins/fileUtils.js b/plugins/fileUtils.js
index 14ceedfa7..0f21df1ef 100644
--- a/plugins/fileUtils.js
+++ b/plugins/fileUtils.js
@@ -15,7 +15,6 @@ import { formatBytes } from '~/plugins/shorthands'
export const fileIsValid = (file, validationOptions) => {
const { maxSize, alertOnInvalid } = validationOptions
if (maxSize !== null && maxSize !== undefined && file.size > maxSize) {
- console.log(`File size: ${file.size}, max size: ${maxSize}`)
if (alertOnInvalid) {
alert(
`File ${file.name} is too big! Must be less than ${formatBytes(
@@ -39,6 +38,8 @@ export const acceptFileFromProjectType = (projectType) => {
return '.zip,application/zip'
case 'shader':
return '.zip,application/zip'
+ case 'datapack':
+ return '.zip,application/zip'
case 'modpack':
return '.mrpack,application/x-modrinth-modpack+zip'
default:
@@ -108,7 +109,7 @@ export const inferVersionInfo = async function (
'META-INF/mods.toml': (file, zip) => {
const metadata = TOML.parse(file)
- console.log(JSON.stringify(metadata))
+ // ${file.jarVersion} -> Implementation-Version from manifest
// TODO: Parse minecraft version ranges, handle if version is set to value from manifest
if (metadata.mods && metadata.mods.length > 0) {
@@ -165,8 +166,10 @@ export const inferVersionInfo = async function (
version_type: versionType(metadata.quilt_loader.version),
game_versions: metadata.quilt_loader.depends
? gameVersionRange(
- metadata.depends.find((x) => x.id === 'minecraft')
- ? metadata.depends.find((x) => x.id === 'minecraft').versions
+ metadata.quilt_loader.depends.find((x) => x.id === 'minecraft')
+ ? metadata.quilt_loader.depends.find(
+ (x) => x.id === 'minecraft'
+ ).versions
: [],
gameVersions
)
@@ -222,6 +225,112 @@ export const inferVersionInfo = async function (
.map((x) => x.version),
}
},
+ // Resource Packs + Data Packs
+ 'pack.mcmeta': (file) => {
+ const metadata = JSON.parse(file)
+
+ function getRange(versionA, versionB) {
+ const startingIndex = gameVersions.findIndex(
+ (x) => x.version === versionA
+ )
+ const endingIndex = gameVersions.findIndex(
+ (x) => x.version === versionB
+ )
+
+ const final = []
+ const filterOnlyRelease =
+ gameVersions[startingIndex].version_type === 'release'
+
+ for (let i = startingIndex; i >= endingIndex; i--) {
+ if (
+ gameVersions[i].version_type === 'release' ||
+ !filterOnlyRelease
+ ) {
+ final.push(gameVersions[i].version)
+ }
+ }
+
+ return final
+ }
+
+ const loaders = []
+ let newGameVersions = []
+
+ if (project.actualProjectType === 'mod') {
+ loaders.push('datapack')
+
+ switch (metadata.pack.pack_format) {
+ case 4:
+ newGameVersions = getRange('1.13', '1.14.4')
+ break
+ case 5:
+ newGameVersions = getRange('1.15', '1.16.1')
+ break
+ case 6:
+ newGameVersions = getRange('1.16.2', '1.16.5')
+ break
+ case 7:
+ newGameVersions = getRange('1.17', '1.17.1')
+ break
+ case 8:
+ newGameVersions = getRange('1.18', '1.18.1')
+ break
+ case 9:
+ newGameVersions.push('1.18.2')
+ break
+ case 10:
+ newGameVersions = getRange('1.19', '1.19.3')
+ break
+ default:
+ }
+ }
+
+ if (project.actualProjectType === 'resourcepack') {
+ loaders.push('minecraft')
+
+ switch (metadata.pack.pack_format) {
+ case 1:
+ newGameVersions = getRange('1.6.1', '1.8.9')
+ break
+ case 2:
+ newGameVersions = getRange('1.9', '1.10.2')
+ break
+ case 3:
+ newGameVersions = getRange('1.11', '1.12.2')
+ break
+ case 4:
+ newGameVersions = getRange('1.13', '1.14.4')
+ break
+ case 5:
+ newGameVersions = getRange('1.15', '1.16.1')
+ break
+ case 6:
+ newGameVersions = getRange('1.16.2', '1.16.5')
+ break
+ case 7:
+ newGameVersions = getRange('1.17', '1.17.1')
+ break
+ case 8:
+ newGameVersions = getRange('1.18', '1.18.2')
+ break
+ case 9:
+ newGameVersions = getRange('1.19', '1.19.2')
+ break
+ case 11:
+ newGameVersions = getRange('22w42a', '22w44a')
+ break
+ case 12:
+ newGameVersions.push('1.19.3')
+ break
+ default:
+ }
+ }
+
+ return {
+ loaders,
+ game_versions: newGameVersions,
+ }
+ },
}
const zipReader = new JSZip()
@@ -237,3 +346,201 @@ export const inferVersionInfo = async function (
}
}
}
+
+export const createDataPackVersion = async function (
+ project,
+ version,
+ primaryFile,
+ members,
+ allGameVersions,
+ loaders
+) {
+ // force version to start with number, as required by FML
+ const newVersionNumber = version.version_number.match(/^\d/)
+ ? version.version_number
+ : `1-${version.version_number}`
+
+ const newSlug = `${project.slug
+ .replace('-', '_')
+ .replace(/\W/g, '')
+ .substring(0, 63)}_mr`
+
+ const iconPath = `${project.slug}_pack.png`
+
+ const fabricModJson = {
+ schemaVersion: 1,
+ id: newSlug,
+ version: newVersionNumber,
+ name: project.title,
+ description: project.description,
+ authors: members.map((x) => x.name),
+ contact: {
+ homepage: `${process.env.domain}/${project.project_type}/${
+ project.slug ?? project.id
+ }`,
+ },
+ license: project.license.id,
+ icon: iconPath,
+ environment: '*',
+ depends: {
+ 'fabric-resource-loader-v0': '*',
+ },
+ }
+
+ const quiltModJson = {
+ schema_version: 1,
+ quilt_loader: {
+ group: 'com.modrinth',
+ id: newSlug,
+ version: newVersionNumber,
+ metadata: {
+ name: project.title,
+ description: project.description,
+ contributors: members.reduce(
+ (acc, x) => ({
+ ...acc,
+ [x.name]: x.role,
+ }),
+ {}
+ ),
+ contact: {
+ homepage: `${process.env.domain}/${project.project_type}/${
+ project.slug ?? project.id
+ }`,
+ },
+ icon: iconPath,
+ },
+ intermediate_mappings: 'net.fabricmc:intermediary',
+ depends: [
+ {
+ id: 'quilt_resource_loader',
+ versions: '*',
+ unless: 'fabric-resource-loader-v0',
+ },
+ ],
+ },
+ }
+
+ const cutoffIndex = allGameVersions.findIndex((x) => x.version === '1.18.2')
+
+ let maximumIndex = Number.MIN_VALUE
+ for (const val of version.game_versions) {
+ const index = allGameVersions.findIndex((x) => x.version === val)
+ if (index > maximumIndex) {
+ maximumIndex = index
+ }
+ }
+
+ const newForge = maximumIndex < cutoffIndex
+
+ const forgeModsToml = {
+ modLoader: newForge ? 'lowcodefml' : 'javafml',
+ loaderVersion: newForge ? '[40,)' : '[25,)',
+ license: project.license.id,
+ showAsResourcePack: true,
+ mods: [
+ {
+ modId: newSlug,
+ version: newVersionNumber,
+ displayName: project.title,
+ description: project.description,
+ logoFile: iconPath,
+ updateJSONURL: `${process.env.authURLBase.replace(
+ '/v2/',
+ ''
+ )}/updates/${project.id}/forge_updates.json`,
+ credits: 'Generated by Modrinth',
+ authors: members.map((x) => x.name).join(', '),
+ displayURL: `${process.env.domain}/${project.project_type}/${
+ project.slug ?? project.id
+ }`,
+ },
+ ],
+ }
+
+ if (project.source_url) {
+ quiltModJson.quilt_loader.metadata.contact.sources = project.source_url
+ fabricModJson.contact.sources = project.source_url
+ }
+
+ if (project.issues_url) {
+ quiltModJson.quilt_loader.metadata.contact.issues = project.issues_url
+ fabricModJson.contact.issues = project.issues_url
+ forgeModsToml.issueTrackerURL = project.issues_url
+ }
+
+ const primaryFileData = await (await fetch(primaryFile.url)).blob()
+
+ const primaryZipReader = new JSZip()
+ await primaryZipReader.loadAsync(primaryFileData)
+
+ if (loaders.includes('fabric'))
+ primaryZipReader.file('fabric.mod.json', JSON.stringify(fabricModJson))
+ if (loaders.includes('quilt'))
+ primaryZipReader.file('quilt.mod.json', JSON.stringify(quiltModJson))
+ if (loaders.includes('forge'))
+ primaryZipReader.file('META-INF/mods.toml', TOML.stringify(forgeModsToml))
+
+ if (!newForge && loaders.includes('forge')) {
+ const classFile = new Uint8Array(
+ await (
+ await fetch(
+ 'https://cdn.modrinth.com/wrapper/ModrinthWrapperRestiched.class'
+ )
+ ).arrayBuffer()
+ )
+
+ let binary = ''
+ for (let i = 0; i < classFile.byteLength; i++) {
+ binary += String.fromCharCode(classFile[i])
+ }
+
+ binary = binary
+ .replace(
+ String.fromCharCode(32) + 'needs1to1be1changed1modrinth1mod',
+ String.fromCharCode(newSlug.length) + newSlug
+ )
+ .replace('/wrappera/', `/${project.id.substring(0, 8)}/`)
+
+ const newArr = []
+ for (let i = 0; i < binary.length; i++) {
+ newArr.push(binary.charCodeAt(i))
+ }
+
+ primaryZipReader.file(
+ `com/modrinth/${project.id.substring(0, 8)}/ModrinthWrapper.class`,
+ new Uint8Array(newArr)
+ )
+ }
+
+ const resourcePack = version.files.find(
+ (x) => x.file_type === 'required-resource-pack'
+ )
+
+ const resourcePackData = resourcePack
+ ? await (await fetch(resourcePack.url)).blob()
+ : null
+
+ if (resourcePackData) {
+ const resourcePackReader = new JSZip()
+ await resourcePackReader.loadAsync(resourcePackData)
+
+ for (const [path, file] of Object.entries(resourcePackReader.files)) {
+ if (!primaryZipReader.file(path) && !path.includes('.mcassetsroot')) {
+ primaryZipReader.file(path, await file.async('uint8array'))
+ }
+ }
+ }
+
+ if (primaryZipReader.file('pack.png')) {
+ primaryZipReader.file(
+ iconPath,
+ await primaryZipReader.file('pack.png').async('uint8array')
+ )
+ }
+
+ return await primaryZipReader.generateAsync({
+ type: 'blob',
+ mimeType: 'application/java-archive',
+ })
+}
diff --git a/plugins/shorthands.js b/plugins/shorthands.js
index c7d68145f..73145e828 100644
--- a/plugins/shorthands.js
+++ b/plugins/shorthands.js
@@ -153,24 +153,46 @@ export default (ctx, inject) => {
const isMod = categories.some((category) => {
return ctx.store.state.tag.loaderData.modLoaders.includes(category)
})
- return isPlugin && isMod ? 'mod and plugin' : isPlugin ? 'plugin' : 'mod'
- } else {
- return formatProjectType(type)
+ const isDataPack = categories.some((category) => {
+ return ctx.store.state.tag.loaderData.dataPackLoaders.includes(category)
+ })
+
+ if (isMod && isPlugin && isDataPack) {
+ return 'mod, plugin, and data pack'
+ } else if (isMod && isPlugin) {
+ return 'mod and plugin'
+ } else if (isMod && isDataPack) {
+ return 'mod and datapack'
+ }
}
+
+ return type
})
inject('getProjectTypeForUrl', (type, categories) => {
if (type === 'mod') {
+ const isMod = categories.some((category) => {
+ return ctx.store.state.tag.loaderData.modLoaders.includes(category)
+ })
+
const isPlugin = categories.some((category) => {
return ctx.store.state.tag.loaderData.allPluginLoaders.includes(
category
)
})
- const isMod = categories.some((category) => {
- return ctx.store.state.tag.loaderData.modLoaders.includes(category)
+ const isDataPack = categories.some((category) => {
+ return ctx.store.state.tag.loaderData.dataPackLoaders.includes(category)
})
- return isPlugin && isMod ? 'mod' : isPlugin ? 'plugin' : 'mod'
+ if (isDataPack) {
+ return 'datapack'
+ } else if (isPlugin) {
+ return 'plugin'
+ } else if (isMod) {
+ return 'mod'
+ } else {
+ return 'mod'
+ }
} else {
return type
}
@@ -232,7 +254,10 @@ export const formatWallet = (name) => {
export const formatProjectType = (name) => {
if (name === 'resourcepack') {
return 'Resource Pack'
+ } else if (name === 'datapack') {
+ return 'Data Pack'
}
+
return capitalizeString(name)
}
@@ -261,6 +286,8 @@ export const formatCategory = (name) => {
return 'Path Tracing'
} else if (name === 'pbr') {
return 'PBR'
+ } else if (name === 'datapack') {
+ return 'Data pack'
}
return capitalizeString(name)
diff --git a/store/cosmetics.js b/store/cosmetics.js
index cf9c4f390..8b2314c7b 100644
--- a/store/cosmetics.js
+++ b/store/cosmetics.js
@@ -19,6 +19,7 @@ export const defaults = {
resourcepack: 'gallery',
modpack: 'list',
shader: 'gallery',
+ datapack: 'list',
user: 'list',
},
}
diff --git a/store/tag.js b/store/tag.js
index 160a05333..5a646c205 100644
--- a/store/tag.js
+++ b/store/tag.js
@@ -17,6 +17,11 @@ export const state = () => ({
id: 'plugin',
display: 'plugin',
},
+ {
+ actual: 'mod',
+ id: 'datapack',
+ display: 'datapack',
+ },
{
actual: 'resourcepack',
id: 'resourcepack',
@@ -46,6 +51,7 @@ export const state = () => ({
'waterfall',
'velocity',
],
+ dataPackLoaders: ['datapack'],
modLoaders: ['forge', 'fabric', 'quilt', 'liteloader', 'modloader', 'rift'],
},
projectViewModes: ['list', 'grid', 'gallery'],