Skip to content

Commit 36692a2

Browse files
NoaaanNoaaan
committed
I backported everything, bumps version
Signed-off-by: Noaaan <[email protected]>
1 parent 4b3e0e7 commit 36692a2

File tree

12 files changed

+276
-266
lines changed

12 files changed

+276
-266
lines changed

‎build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '0.11-SNAPSHOT'
2+
id 'fabric-loom' version '0.12-SNAPSHOT'
33
id 'maven-publish'
44
id 'io.github.juuxel.loom-quiltflower' version '1.7.2'
55
}
@@ -45,7 +45,6 @@ dependencies {
4545
// REI + Arch
4646
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
4747
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
48-
modRuntimeOnly "dev.architectury:architectury-fabric:${project.architectury_version}"
4948

5049
// ModMenu
5150
modApi("com.terraformersmc:modmenu:${project.modmenu_version}")

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ yarn_mappings=1.18.2+build.2
99
loader_version=0.14.8
1010

1111
# Mod Properties
12-
mod_version = 0.14.4
12+
mod_version = 0.15.3+1.18.2
1313
maven_group = nourl.mythicmetals
1414
archives_base_name = mythicmetals
1515

‎src/main/java/nourl/mythicmetals/MythicMetals.java

+1-9
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
import dev.onyxstudios.cca.api.v3.entity.EntityComponentInitializer;
77
import dev.onyxstudios.cca.api.v3.entity.RespawnCopyStrategy;
88
import io.wispforest.owo.itemgroup.OwoItemGroup;
9-
import io.wispforest.owo.ops.LootOps;
109
import io.wispforest.owo.registration.reflect.FieldRegistrationHandler;
1110
import me.shedaniel.autoconfig.AutoConfig;
1211
import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
1312
import net.fabricmc.api.ModInitializer;
1413
import net.fabricmc.fabric.api.registry.FuelRegistry;
1514
import net.fabricmc.loader.api.FabricLoader;
16-
import net.minecraft.loot.LootTables;
1715
import nourl.mythicmetals.abilities.Abilities;
1816
import nourl.mythicmetals.armor.CarmotShield;
1917
import nourl.mythicmetals.armor.MythicArmor;
@@ -22,15 +20,10 @@
2220
import nourl.mythicmetals.config.MythicConfig;
2321
import nourl.mythicmetals.item.MythicItemGroups;
2422
import nourl.mythicmetals.item.MythicItems;
25-
import nourl.mythicmetals.registry.RegisterEntities;
26-
import nourl.mythicmetals.registry.RegisterEntityAttributes;
27-
import nourl.mythicmetals.registry.RegisterRecipeSerializers;
28-
import nourl.mythicmetals.registry.RegisterSounds;
23+
import nourl.mythicmetals.registry.*;
2924
import nourl.mythicmetals.tools.MythicTools;
3025
import nourl.mythicmetals.utils.BlockBreaker;
31-
import nourl.mythicmetals.registry.MythicCommands;
3226
import nourl.mythicmetals.utils.MythicParticleSystem;
33-
import nourl.mythicmetals.registry.RegisterResourceConditions;
3427
import nourl.mythicmetals.utils.RegistryHelper;
3528
import nourl.mythicmetals.world.MythicOreFeatures;
3629
import org.apache.logging.log4j.LogManager;
@@ -75,7 +68,6 @@ public void onInitialize() {
7568
RegisterRecipeSerializers.init();
7669
RegisterEntityAttributes.init();
7770
BlockBreaker.initHammerTime();
78-
LootOps.injectItem(MythicItems.Ingots.UNOBTAINIUM, 0.01F, LootTables.ANCIENT_CITY_CHEST);
7971

8072
if (CONFIG.configVersion < CONFIG_VERSION) {
8173
LOGGER.warn("[Mythic Metals] Your config is outdated. Please update it manually in the file, or delete the file so it can be re-generated.");

‎src/main/java/nourl/mythicmetals/MythicMetalsClient.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
import nourl.mythicmetals.blocks.BanglumNukeEntityRenderer;
2424
import nourl.mythicmetals.blocks.BanglumTntEntityRenderer;
2525
import nourl.mythicmetals.mixin.WorldRendererInvoker;
26-
import nourl.mythicmetals.models.*;
26+
import nourl.mythicmetals.models.CarmotStaffBlockRenderer;
27+
import nourl.mythicmetals.models.MythicModelHandler;
28+
import nourl.mythicmetals.models.PlayerEnergySwirlFeatureRenderer;
29+
import nourl.mythicmetals.models.StarPlatinumArrowEntityRenderer;
2730
import nourl.mythicmetals.registry.RegisterEntities;
2831
import nourl.mythicmetals.tools.BanglumPick;
2932
import nourl.mythicmetals.tools.BanglumShovel;

‎src/main/java/nourl/mythicmetals/abilities/Ability.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
66
import net.fabricmc.loader.api.FabricLoader;
77
import net.minecraft.item.Item;
8-
import net.minecraft.text.*;
8+
import net.minecraft.text.LiteralText;
9+
import net.minecraft.text.MutableText;
10+
import net.minecraft.text.Style;
11+
import net.minecraft.text.TranslatableText;
912
import net.minecraft.util.Formatting;
1013
import nourl.mythicmetals.armor.ArmorSet;
1114
import nourl.mythicmetals.tools.MidasGoldSword;

‎src/main/java/nourl/mythicmetals/config/MythicConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class MythicConfig implements ConfigData {
7272
public int configVersion = MythicMetals.CONFIG_VERSION;
7373
@ConfigEntry.Gui.RequiresRestart
7474
public boolean disableFunny = false;
75-
public int banglumNukeCoreRadius = 32;
75+
public int banglumNukeCoreRadius = 24;
7676

7777
public ArrayList<String> blacklist = new ArrayList<>();
7878
}

‎src/main/java/nourl/mythicmetals/data/MythicTagProviders.java

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import nourl.mythicmetals.MythicMetals;
99
import nourl.mythicmetals.blocks.BlockSet;
1010
import nourl.mythicmetals.blocks.MythicBlocks;
11-
import nourl.mythicmetals.data.MythicTags;
1211
import nourl.mythicmetals.item.MythicItems;
1312

1413
import java.util.ArrayList;

‎src/main/java/nourl/mythicmetals/mixin/CapeFeatureRendererMixin.java

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import net.fabricmc.api.EnvType;
44
import net.fabricmc.api.Environment;
55
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRenderEvents;
6-
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback;
76
import net.minecraft.client.network.AbstractClientPlayerEntity;
87
import net.minecraft.client.render.OverlayTexture;
98
import net.minecraft.client.render.RenderLayer;

‎src/main/java/nourl/mythicmetals/registry/RegisterRecipeSerializers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package nourl.mythicmetals.registry;
22

33
import net.minecraft.util.registry.Registry;
4-
import nourl.mythicmetals.utils.RegistryHelper;
54
import nourl.mythicmetals.tools.SpecialSmithingRecipe;
5+
import nourl.mythicmetals.utils.RegistryHelper;
66

77
public class RegisterRecipeSerializers {
88

‎src/main/java/nourl/mythicmetals/utils/EpicExplosion.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package nourl.mythicmetals.utils;
22

3-
import net.minecraft.block.*;
3+
import net.minecraft.block.BlockState;
4+
import net.minecraft.block.Blocks;
45
import net.minecraft.server.world.ServerWorld;
56
import net.minecraft.util.math.BlockPos;
67

‎src/main/resources/assets/mythicmetals/lang/en_us.json

+19-5
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,17 @@
512512
"text.autoconfig.mythicmetals_config.option.end_starrite.top": "End Starrite Max Spawn Height",
513513
"text.autoconfig.mythicmetals_config.option.end_starrite.trapezoid": "Should End Starrite use trapezoid range?",
514514
"text.autoconfig.mythicmetals_config.option.end_starrite.veinSize": "Max End Starrite Vein Size",
515+
"text.autoconfig.mythicmetals_config.option.nether_banglum": "Nether Banglum Ore Settings",
516+
"text.autoconfig.mythicmetals_config.option.nether_banglum.enabled": "Generate Nether Banglum Ore",
517+
"text.autoconfig.mythicmetals_config.option.nether_banglum.bottom": "Nether Banglum Minimum Spawn Height",
518+
"text.autoconfig.mythicmetals_config.option.nether_banglum.offset": "Should Nether Banglum be offset?",
519+
"text.autoconfig.mythicmetals_config.option.nether_banglum.perChunk": "Nether Banglum Spawn Chance",
520+
"text.autoconfig.mythicmetals_config.option.nether_banglum.top": "Nether Banglum Max Spawn Height",
521+
"text.autoconfig.mythicmetals_config.option.nether_banglum.veinSize": "Max Nether Banglum Vein Size",
522+
"text.autoconfig.mythicmetals_config.option.nether_banglum.discardChance": "Discard chance of Nether Banglum",
523+
"text.autoconfig.mythicmetals_config.option.nether_banglum.trapezoid": "Should Nether Banglum use trapezoid range?",
515524
"text.autoconfig.mythicmetals_config.option.calcite_kyber": "Calcite Kyber Ore Settings",
525+
"text.autoconfig.mythicmetals_config.option.calcite_kyber.enabled": "Generate Calcite Kyber Ore",
516526
"text.autoconfig.mythicmetals_config.option.calcite_kyber.bottom": "Calcite Kyber Minimum Spawn Height",
517527
"text.autoconfig.mythicmetals_config.option.calcite_kyber.offset": "Should Calcite Kyber be offset?",
518528
"text.autoconfig.mythicmetals_config.option.calcite_kyber.perChunk": "Calcite Kyber Spawn Chance",
@@ -628,20 +638,24 @@
628638
"text.autoconfig.mythicmetals_config.option.quadrillum.top": "Quadrillum Max Spawn Height",
629639
"text.autoconfig.mythicmetals_config.option.quadrillum.trapezoid": "Should Quadrillum use trapezoid range?",
630640
"text.autoconfig.mythicmetals_config.option.quadrillum.veinSize": "Max Quadrillum Vein Size",
641+
"text.autoconfig.mythicmetals_config.option.deepslate_runite": "Deepslate Runite Ore Settings",
642+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.bottom": "Deepslate Runite Minimum Spawn Height",
643+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.discardChance": "Discard chance of Deepslate Runite",
644+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.enabled": "Generate Deepslate Runite Ore",
645+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.offset": "Should Deepslate Runite be offset?",
646+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.perChunk": "Deepslate Runite Spawn Chance",
647+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.top": "Deepslate Runite Max Spawn Height",
648+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.trapezoid": "Should Deepslate Runite use trapezoid range?",
649+
"text.autoconfig.mythicmetals_config.option.deepslate_runite.veinSize": "Max Deepslate Runite Vein Size",
631650
"text.autoconfig.mythicmetals_config.option.runite": "Runite Ore Settings",
632651
"text.autoconfig.mythicmetals_config.option.runite.bottom": "Runite Minimum Spawn Height",
633-
"text.autoconfig.mythicmetals_config.option.runite.bottomVariant": "Deepslate Runite Minimum Spawn Height",
634652
"text.autoconfig.mythicmetals_config.option.runite.discardChance": "Discard chance of Runite",
635653
"text.autoconfig.mythicmetals_config.option.runite.enabled": "Generate Runite Ore",
636654
"text.autoconfig.mythicmetals_config.option.runite.offset": "Should Runite be offset?",
637-
"text.autoconfig.mythicmetals_config.option.runite.offsetVariant": "Should Deepslate Runite be offset?",
638655
"text.autoconfig.mythicmetals_config.option.runite.perChunk": "Runite Spawn Chance",
639-
"text.autoconfig.mythicmetals_config.option.runite.perChunkVariant": "Deepslate Runite Spawn Chance",
640656
"text.autoconfig.mythicmetals_config.option.runite.top": "Runite Max Spawn Height",
641-
"text.autoconfig.mythicmetals_config.option.runite.topVariant": "Deepslate Runite Max Spawn Height",
642657
"text.autoconfig.mythicmetals_config.option.runite.trapezoid": "Should Runite use trapezoid range?",
643658
"text.autoconfig.mythicmetals_config.option.runite.veinSize": "Max Runite Vein Size",
644-
"text.autoconfig.mythicmetals_config.option.runite.veinSizeVariant": "Max Deepslate Runite Vein Size",
645659
"text.autoconfig.mythicmetals_config.option.silver": "Silver Ore Settings",
646660
"text.autoconfig.mythicmetals_config.option.silver.bottom": "Silver Minimum Spawn Height",
647661
"text.autoconfig.mythicmetals_config.option.silver.discardChance": "Discard chance of Silver",

0 commit comments

Comments
 (0)