Skip to content

Commit

Permalink
Testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Starexify committed Nov 5, 2024
1 parent 999da63 commit 58ea884
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 18 deletions.
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ group = mod_group_id

repositories {
mavenLocal()
maven { url = "https://api.modrinth.com/maven/" }
}

base {
Expand Down Expand Up @@ -98,8 +99,8 @@ dependencies {
// For all intends and purposes: You can treat this dependency as if it is a normal library you would use.
implementation "net.neoforged:neoforge:${neo_version}"

implementation files("libs/big_swords-${bsr_version}.jar")
implementation files("libs/cosmicore-${cosmicore_version}.jar")
implementation "maven.modrinth:big-swords-rr:${bsr_version}"
implementation "maven.modrinth:cosmicore:${cosmicore_version}"

// implementation "net.nova.big_swords:big_swords:${bsr_version}"

Expand Down Expand Up @@ -144,7 +145,9 @@ tasks.withType(ProcessResources).configureEach {
mod_authors : mod_authors,
mod_description : mod_description,
bsr_version : bsr_version,
cosmicore_version : cosmicore_version
bsr_version_range : bsr_version_range,
cosmicore_version : cosmicore_version,
cosmicore_version_range: cosmicore_version_range
]
inputs.properties replaceProperties

Expand Down
8 changes: 5 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ minecraft_version=1.21
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.21,1.21.1)
# The Neo version must agree with the Minecraft version to get a valid artifact
neo_version=21.1.72
neo_version=21.1.73
# The Neo version range can use any version of Neo as bounds
neo_version_range=[21.0.0-beta,)
# The loader version range can only use the major version of FML as bounds
Expand All @@ -34,5 +34,7 @@ mod_description=Big Swords R x Cosmicore compatibility mod which adds the big sw

## Dependencies

bsr_version=4.0.0
cosmicore_version=1.1.0-beta
bsr_version=4.0.1
bsr_version_range=[4.0.1,)
cosmicore_version=1.1.0-beta
cosmicore_version_range=[1.1.0-beta,)
Binary file removed libs/big_swords-4.0.0.jar
Binary file not shown.
Binary file removed libs/cosmicore-1.1.0-beta.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package net.nova.big_swords_addon.client.render.item;

import net.minecraft.client.renderer.item.ItemProperties;
import net.minecraft.world.item.Item;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.nova.big_swords.client.renderer.item.BSItemProperties;
Expand All @@ -14,10 +12,4 @@ public static void addCustomItemProperties() {
makeShield(BCItems.TITANIUM_SHIELD.get());
makeShield(BCItems.GILDED_TITANIUM_SHIELD.get());
}

private static void makeShield(Item item) {
ItemProperties.register(item, blockingPredicate,
(p_174575_, p_174576_, p_174577_, p_174578_) -> p_174577_ != null && p_174577_.isUsingItem() && p_174577_.getUseItem() == p_174575_ ? 1.0F : 0.0F
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
public class BigSwordsRAddonClient {
@SubscribeEvent
public static void addCreative(BuildCreativeModeTabContentsEvent event) {
CreativeModeTab bigSwordsTab = CreativeTab.BIG_SWORDS_TAB.get();
CreativeModeTab bigSwordsTab = CreativeTab.BIG_SWORDS_TAB.value();

if (event.getTab() == bigSwordsTab) {
putAfter(BSItems.PATCHWORK_BIG_SWORD.get(), BCItems.TITANIUM_BIG_SWORD, event);
Expand Down
5 changes: 2 additions & 3 deletions src/main/resources/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,21 @@ sources="https://github.com/Starexify/BigSwordsRxCosmicore"
[[dependencies.${mod_id}]]
modId="minecraft"
type="required"
# This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange="${minecraft_version_range}"
ordering="NONE"
side="BOTH"

[[dependencies.${mod_id}]]
modId="big_swords"
type="required"
versionRange="[4.0.0,)"
versionRange="${bsr_version_range}"
ordering="NONE"
side="BOTH"

[[dependencies.${mod_id}]]
modId="cosmicore"
type="required"
versionRange="[1.0.0-beta,)"
versionRange="${cosmicore_version_range}"
ordering="NONE"
side="BOTH"

Expand Down

0 comments on commit 58ea884

Please sign in to comment.