Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
325 changes: 140 additions & 185 deletions build.gradle

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx4G

# tell architectury loom that this project is a forge project.
# this will enable us to use the "forge" dependency.
# using archloom without this is possible and will give you a
# "standard" loom installation with some extra features.
loom.platform=forge

# Base properties
# minecraft version
minecraft_version=1.20.1
# forge version, latest version can be found on https://files.minecraftforge.net/
forge_version=47.2.17
# yarn, latest version can be found on https://fabricmc.net/develop/
parchment_mappings=2023.09.03
quilt_mappings=23
forge_version=47.3.0
mapping_channel=parchment
mapping_version=2023.09.03-1.20.1

# Mod Properties
mod_version=0.6.0
maven_group=com.ghostipedia.frontiers
archives_base_name=cosmic-core
mod_id=cosmiccore
mod_name=Cosmic Core
mod_url=
mod_author=Ghostipedia
mod_license=All rights reserved

# Dependencies
architectury_version=9.2.14
gtceu_version=1.6.4
ldlib_version=1.0.34
registrate_version=MC1.20-1.3.3
kubejs_version=2001.6.4-build.120
patchouli_version=81
curios_version=5.9.0
registrate_version=MC1.20-1.3.11
rhino_version=2001.2.3-build.6
kubejs_version=2001.6.5-build.14
configuration_version=2.2.0
jei_version=15.20.0.105
emi_version=1.1.13+1.20.1
emi_version=1.1.13
jade_version=11.12.3
patchouli_version=81
curios_version=5.9.0
mixinextras_version=0.2.0
blood_magic_version=3.3.3-45

# Ad Astra
ad_astra_version=1.15.18
Expand Down
7 changes: 3 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ pluginManagement {
// when using additional gradle plugins like shadow,
// add their repositories to this list!
repositories {
maven { url "https://maven.fabricmc.net/" }
maven { url "https://maven.architectury.dev/" }
maven { url "https://files.minecraftforge.net/maven/" }
gradlePluginPortal()
gradlePluginPortal() // Needed for spotless
maven { url = 'https://maven.minecraftforge.net/' }
maven { url = 'https://maven.parchmentmc.org' }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import com.gregtechceu.gtceu.api.recipe.GTRecipe;
import com.gregtechceu.gtceu.common.data.GTRecipeModifiers;

import dev.architectury.patchedmixin.staticmixin.spongepowered.asm.mixin.injection.At;
import dev.architectury.patchedmixin.staticmixin.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Debug;
import org.spongepowered.asm.mixin.Mixin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
@Mixin(LootTable.class)
public interface LootTableAccessor {

@Accessor(value = "f_79109_", remap = false)
@Accessor(value = "pools", remap = false)
List<LootPool> getPools();
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ public abstract class SoundManagerMixin {
@Final
private SoundEngine soundEngine;

@Inject(
method = "play",
at = @At("HEAD"),
cancellable = true)
@Inject(method = "play", at = @At("HEAD"), cancellable = true)
private void onPlay(SoundInstance sound, CallbackInfo callbackInfo) {
if (cosmicCore$checkForSpaceRadio()) {
callbackInfo.cancel(); // Early exits Ad Astra's mixin from being called. Hopefully
Expand All @@ -49,10 +46,7 @@ private void onPlay(SoundInstance sound, CallbackInfo callbackInfo) {
}
}

@Inject(
method = "playDelayed",
at = @At("HEAD"),
cancellable = true)
@Inject(method = "playDelayed", at = @At("HEAD"), cancellable = true)
private void onPlayDelayed(SoundInstance sound, int delay, CallbackInfo callbackInfo) {
if (cosmicCore$checkForSpaceRadio()) {
callbackInfo.cancel();
Expand Down
32 changes: 15 additions & 17 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# Any fields that aren't annotated with #optional are *required*!
modLoader = "javafml"
loaderVersion = "[47,)"
license = "All rights reserved" # Want to make your mod open source? Check out https://choosealicense.com/!
license = "${mod_license}" # Want to make your mod open source? Check out https://choosealicense.com/!

# This is a URL to e.g. your GitHub or CurseForge issues page.
# It will appear in any crash reports this mod is directly involved in.
# issueTrackerURL="https://github.com/invalid/pleasechangeme/issues" #optional
# A list of mods - how many allowed here is determined by the individual mod loader

[[mods]]
modId = "cosmiccore"
modId = "${mod_id}"
# The version number of the mod - unlike in the Forge MDK,
# we'll use the processResources task to replace this for us
version = "${version}"
displayName = "Cosmic Core"
displayName = "${mod_name}"
# This URL will be queried by the Forge update checker in order to find the latest version of your mod.
# If an update is found, you'll see a little blinking "emerald" symbol on your Mods button!
# updateJSONURL="https://changeme.dev/updates.json" #optional
Expand All @@ -25,7 +25,7 @@ displayName = "Cosmic Core"
# Some more fluff displayed in the Mods panel. Feel free to issue your special thanks here!
# credits="Thanks to Mojang for making this great game" #optional
# Some more fluff displayed in the Mods panel. Plug your stuff here!
# authors="Me!" #optional
authors = "${mod_author}"
# A multi-line description for your mod. This has no minimum length, but it *is* required!
description = '''
This is a very cool mod that does... things.
Expand All @@ -38,34 +38,32 @@ Have I reached 280 characters yet?
# An (optional) dependency for your mod. Though technically not required,
# it's always helpful to add these to stop your mod from loading when something is missing
# rather than erroring out later
[[dependencies.cosmiccore]]
modId = "forge"
mandatory = true # do you **need** this mod to be able to launch?
# A version range using interval notation.
# Brackets mean "inclusive" bounds, while parentheses mean "exclusive".
versionRange = "[47,)" # This essentially means any forge >= 47
ordering = "NONE" # Use this if you want your mod to be loaded specifically BEFORE or AFTER another mod
side = "BOTH" # Specify where this mod is required: can be BOTH, CLIENT or SERVER
[[dependencies.${mod_id}]]
modId = "forge"
mandatory = true # do you **need** this mod to be able to launch?
versionRange = "[${forge_version},)" # This essentially means any forge >= 47
ordering = "NONE" # Use this if you want your mod to be loaded specifically BEFORE or AFTER another mod
side = "BOTH" # Specify where this mod is required: can be BOTH, CLIENT or SERVER

# And another dependency, use this if you want to require a certain Minecraft version.
[[dependencies.cosmiccore]]
[[dependencies.${mod_id}]]
modId = "minecraft"
mandatory = true
# See above for how to read this notation, this essentially means any
# version of Minecraft from 1.20.1 (inclusive).
versionRange = "[1.20.1]"
versionRange = "[${minecraft_version}]"
ordering = "NONE"
side = "BOTH"

[[dependencies.cosmiccore]]
[[dependencies.${mod_id}]]
modId="gtceu"
mandatory=true
versionRange="[1.5.0,)"
versionRange="[${gtceu_version},)"
ordering="AFTER"
side="BOTH"


[[dependencies.cosmiccore]]
[[dependencies.${mod_id}]]
modId="legendarysurvivaloverhaul"
mandatory=true
versionRange="[1.20.1-1.20.1-2.0.15,)"
Expand Down
Loading
Loading