Skip to content

Commit 944669e

Browse files
HexeptionHexeption
committed
Fixed Modrinth and Cleaned up
1 parent 5833f61 commit 944669e

File tree

9 files changed

+59
-53
lines changed

9 files changed

+59
-53
lines changed

‎build.gradle‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ buildscript {
99
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
1010
classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
1111
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
12-
classpath group: 'gradle.plugin.com.modrinth.minotaur', name: 'Minotaur', version: '1.1.0'
12+
classpath group: 'com.modrinth.minotaur', name: 'Minotaur', version: '2+'
1313
}
1414
}
1515

1616
apply plugin: 'net.minecraftforge.gradle'
1717
apply plugin: 'org.spongepowered.mixin'
1818
apply plugin: "com.matthewprenger.cursegradle"
1919
apply plugin: 'maven-publish'
20+
apply plugin: 'com.modrinth.minotaur'
2021

2122
version = "1.20.1-1.0"
2223
def env = System.getenv()
@@ -98,6 +99,14 @@ repositories {
9899
name = "Progwml6 maven"
99100
url = "https://dvs1.progwml6.com/files/maven/"
100101
}
102+
maven {
103+
name = "Jared's maven"
104+
url = "https://maven.blamejared.com/"
105+
}
106+
maven {
107+
name = "ModMaven"
108+
url = "https://modmaven.dev"
109+
}
101110
maven {
102111
url "https://www.cursemaven.com"
103112
content {
@@ -199,9 +208,7 @@ publishing {
199208
}
200209
}
201210

202-
import com.modrinth.minotaur.TaskModrinthUpload
203-
204-
task publishModrinth (type: TaskModrinthUpload){
211+
modrinth {
205212
if (env.MODRINTH_API_KEY) {
206213
token = env.MODRINTH_API_KEY
207214
}
@@ -210,6 +217,9 @@ task publishModrinth (type: TaskModrinthUpload){
210217
changelog = 'A changelog can be found at https://github.com/Hexeption/RSInfinityBooster'
211218
versionNumber = "$version"
212219
uploadFile = jar
213-
addGameVersion("1.19.2")
214-
addLoader('forge')
215-
}
220+
gameVersions = ["1.20.1"]
221+
loaders = ["forge"]
222+
dependencies {
223+
required.version "refined-storage", "1.12.3"
224+
}
225+
}

‎src/generated/resources/.cache/26bf1f2a3866808a66e83b8015a7563f5d5821fa‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// 1.20.1 2023-07-29T14:41:12.0692629 Recipes
2+
e668b6eb7ea27c25af3e059d616a7195bfa34404 data/rsinfinitybooster/advancements/recipes/misc/dimension_card.json
3+
825745b5f71f2d4c994c10f833c450c0cb04b771 data/rsinfinitybooster/advancements/recipes/misc/infinity_card.json
4+
648cd514e49c1e62fa3e838ae94ef35f23ed59cf data/rsinfinitybooster/recipes/dimension_card.json
5+
5ee87c2191412babfa022384dd2ffb65dff98de4 data/rsinfinitybooster/recipes/infinity_card.json

src/generated/resources/data/rsinfinitybooster/advancements/recipes/refinedstorage/dimension_card.json renamed to src/generated/resources/data/rsinfinitybooster/advancements/recipes/misc/dimension_card.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@
3030
"recipes": [
3131
"rsinfinitybooster:dimension_card"
3232
]
33-
}
33+
},
34+
"sends_telemetry_event": false
3435
}

src/generated/resources/data/rsinfinitybooster/advancements/recipes/refinedstorage/infinity_card.json renamed to src/generated/resources/data/rsinfinitybooster/advancements/recipes/misc/infinity_card.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@
3030
"recipes": [
3131
"rsinfinitybooster:infinity_card"
3232
]
33-
}
33+
},
34+
"sends_telemetry_event": false
3435
}

‎src/generated/resources/data/rsinfinitybooster/recipes/dimension_card.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
34
"key": {
45
"E": {
56
"item": "minecraft:ender_eye"
@@ -18,5 +19,6 @@
1819
],
1920
"result": {
2021
"item": "rsinfinitybooster:dimension_card"
21-
}
22+
},
23+
"show_notification": true
2224
}

‎src/generated/resources/data/rsinfinitybooster/recipes/infinity_card.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
34
"key": {
45
"E": {
56
"item": "minecraft:ender_eye"
@@ -21,5 +22,6 @@
2122
],
2223
"result": {
2324
"item": "rsinfinitybooster:infinity_card"
24-
}
25+
},
26+
"show_notification": true
2527
}

‎src/main/java/uk/co/hexeption/rsinfinitybooster/RSInfinityBooster.java‎

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,69 @@
11
package uk.co.hexeption.rsinfinitybooster;
22

3-
//import appeng.api.ids.RSCreativeTabIds;
3+
import net.minecraft.core.Registry;
4+
import net.minecraft.core.registries.Registries;
45
import net.minecraft.network.chat.Component;
56
import net.minecraft.resources.ResourceLocation;
7+
import net.minecraft.world.item.CreativeModeTab;
68
import net.minecraft.world.item.Item;
79
import net.minecraft.world.item.ItemStack;
8-
import net.minecraftforge.common.MinecraftForge;
910
import net.minecraftforge.eventbus.api.IEventBus;
10-
import net.minecraftforge.eventbus.api.SubscribeEvent;
11-
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
12-
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
13-
import net.minecraftforge.registries.RegistryObject;
14-
import java.lang.reflect.Field;
15-
import net.minecraft.core.Registry;
16-
import net.minecraft.core.registries.Registries;
17-
import net.minecraftforge.registries.RegisterEvent;
18-
import net.minecraft.world.item.CreativeModeTab;
19-
20-
2111
import net.minecraftforge.fml.ModLoadingContext;
2212
import net.minecraftforge.fml.common.Mod;
2313
import net.minecraftforge.fml.config.ModConfig;
14+
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
15+
import net.minecraftforge.registries.RegisterEvent;
16+
import net.minecraftforge.registries.RegistryObject;
2417
import org.apache.logging.log4j.LogManager;
2518
import org.apache.logging.log4j.Logger;
26-
import uk.co.hexeption.rsinfinitybooster.setup.ModItems;
2719
import uk.co.hexeption.rsinfinitybooster.config.ServerConfig;
20+
import uk.co.hexeption.rsinfinitybooster.setup.ModItems;
2821
import uk.co.hexeption.rsinfinitybooster.setup.Registration;
2922

23+
import java.lang.reflect.Field;
24+
3025
// The value here should match an entry in the META-INF/mods.toml file
3126
@Mod("rsinfinitybooster")
3227
public class RSInfinityBooster {
3328

34-
// Directly reference a log4j logger.
35-
public static final Logger LOGGER = LogManager.getLogger();
36-
37-
public static final String ID = "rsinfinitybooster";
38-
public static final ServerConfig SERVER_CONFIG = new ServerConfig();
39-
29+
public static final String ID = "rsinfinitybooster";
30+
public static final ServerConfig SERVER_CONFIG = new ServerConfig();
4031

32+
public RSInfinityBooster() {
4133

34+
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SERVER_CONFIG.getSpec());
4235

43-
public RSInfinityBooster() {
44-
45-
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SERVER_CONFIG.getSpec());
46-
47-
Registration.register();
36+
Registration.register();
4837

4938
IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
50-
eventBus.addListener((RegisterEvent event) -> {
51-
LOGGER.info("Creating Creative Mode Tab");
52-
if(event.getRegistryKey() == Registries.CREATIVE_MODE_TAB){
39+
eventBus.addListener((RegisterEvent event) -> {
40+
if (event.getRegistryKey() == Registries.CREATIVE_MODE_TAB) {
5341
registerTab(event.getVanillaRegistry());
5442
}
5543
});
56-
57-
5844
}
5945

6046

61-
public static void registerTab(Registry<CreativeModeTab> registry) {
62-
var tab = CreativeModeTab.builder()
47+
public static void registerTab(Registry<CreativeModeTab> registry) {
48+
var tab = CreativeModeTab.builder()
6349
.icon(() -> new ItemStack(ModItems.INFINITY_CARD.get()))
6450
.displayItems((itemDisplayParameters, output) -> {
6551

66-
for (Field field : ModItems.class.getFields()) {
52+
for (Field field : ModItems.class.getFields()) {
6753
if (field.getType() != RegistryObject.class) continue;
6854

69-
try {
55+
try {
7056
RegistryObject<Item> item = (RegistryObject<Item>) field.get(null);
7157
output.accept(new ItemStack(item.get()));
7258
} catch (IllegalAccessException e) {
7359
}
7460
}
7561

76-
}
62+
}
7763
)
7864
.title(Component.translatable("item_group." + ID + ".tab"))
7965
.build();
8066
Registry.register(registry, new ResourceLocation(ID, "aeinfinitybooster"), tab);
81-
82-
}
67+
68+
}
8369
}

‎src/main/java/uk/co/hexeption/rsinfinitybooster/mixins/MixinsWirelessTransmitterNetworkNode.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ private void getRange(CallbackInfoReturnable<Integer> cir) {
3131
if (CardUtil.isInfinityCard(upgrades)) {
3232
cir.setReturnValue(Integer.MAX_VALUE);
3333
}
34+
35+
if (CardUtil.isDimensionCard(upgrades)) {
36+
cir.setReturnValue(Integer.MAX_VALUE);
37+
}
3438
}
3539

3640
@Inject(method = "getEnergyUsage", at = @At("HEAD"), cancellable = true)

0 commit comments

Comments
 (0)