Begin updating to 1.19 and rename mod

This commit is contained in:
Zontreck 2022-06-24 20:42:35 -07:00
parent 26d6cd4d5e
commit f3e94c68a7
52 changed files with 196 additions and 414 deletions

View file

@ -1,4 +1,4 @@
package dev.zontreck.shapedaionresources;
package dev.zontreck.otemod;
import java.util.Set;
import java.util.Map.Entry;
@ -19,37 +19,35 @@ import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.server.ServerStartingEvent;
import net.minecraftforge.event.world.BiomeLoadingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.slf4j.Logger;
import dev.zontreck.shapedaionresources.blocks.ModBlocks;
import dev.zontreck.shapedaionresources.configs.SARServerConfig;
import dev.zontreck.shapedaionresources.events.EventHandler;
import dev.zontreck.shapedaionresources.items.ModItems;
import dev.zontreck.shapedaionresources.ore.OreGenerator;
import dev.zontreck.otemod.blocks.ModBlocks;
import dev.zontreck.otemod.configs.OTEServerConfig;
import dev.zontreck.otemod.events.EventHandler;
import dev.zontreck.otemod.items.ModItems;
import dev.zontreck.otemod.ore.OreGenerator;
// The value here should match an entry in the META-INF/mods.toml file
@Mod(ShapedAionResources.MOD_ID)
public class ShapedAionResources
@Mod(OTEMod.MOD_ID)
public class OTEMod
{
// Directly reference a slf4j logger
public static final Logger LOGGER = LogUtils.getLogger();
public static final String FIRST_JOIN_TAG = "dev.zontreck.shapedaionresources.firstjoin";
public static final String MOD_ID = "shapedaionresources";
public static final String FIRST_JOIN_TAG = "dev.zontreck.otemod.firstjoin";
public static final String MOD_ID = "otemod";
public ShapedAionResources()
public OTEMod()
{
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
// Register the setup method for modloading
bus.addListener(this::setup);
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SARServerConfig.SPEC, "aion-rss-server.toml");
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, OTEServerConfig.SPEC, "aion-rss-server.toml");
@ -105,7 +103,7 @@ public class ShapedAionResources
Set<String> tags = p.getTags();
if(tags.contains(ShapedAionResources.FIRST_JOIN_TAG)){
if(tags.contains(OTEMod.FIRST_JOIN_TAG)){
return false;
}

View file

@ -1,15 +1,14 @@
package dev.zontreck.shapedaionresources.blocks;
package dev.zontreck.otemod.blocks;
import java.util.function.Supplier;
import dev.zontreck.shapedaionresources.ShapedAionResources;
import dev.zontreck.shapedaionresources.items.ModItems;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.items.ModItems;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.OreBlock;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.Material;
@ -19,13 +18,13 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
public class ModBlocks {
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ShapedAionResources.MOD_ID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ShapedAionResources.MOD_ID);
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, OTEMod.MOD_ID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID);
public static void register(IEventBus bus){
BLOCKS.register(bus);
ITEMS.register(bus);
ShapedAionResources.LOGGER.info("Registering all blocks...");
OTEMod.LOGGER.info("Registering all blocks...");
}

View file

@ -0,0 +1,5 @@
package dev.zontreck.otemod.commands;
public class ModCommands {
}

View file

@ -1,4 +1,4 @@
package dev.zontreck.shapedaionresources.configs;
package dev.zontreck.otemod.configs;
import java.util.ArrayList;
@ -9,7 +9,7 @@ import java.util.Map;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.common.ForgeConfigSpec;
public class SARServerConfig {
public class OTEServerConfig {
public static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
public static final ForgeConfigSpec SPEC;
@ -19,7 +19,7 @@ public class SARServerConfig {
static {
List<ItemStack> defaults = new ArrayList<ItemStack>();
BUILDER.push("Configuration for Shaped Aion Cubes Resources");
BUILDER.push("Configuration for OTE Mod Resources");
INITIAL_ITEMS_TO_GIVE_ON_FIRST_JOIN = BUILDER.comment("What items, identified by modid:item, to give to a brand new user on the server").define("New Player Gear", defaults);
BUILDER.pop();

View file

@ -1,14 +1,14 @@
package dev.zontreck.shapedaionresources.events;
package dev.zontreck.otemod.events;
import dev.zontreck.shapedaionresources.ShapedAionResources;
import dev.zontreck.shapedaionresources.ore.OreGenerator;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.ore.OreGenerator;
import net.minecraftforge.event.world.BiomeLoadingEvent;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
@EventBusSubscriber(modid=ShapedAionResources.MOD_ID)
@EventBusSubscriber(modid=OTEMod.MOD_ID)
public class EventHandler {

View file

@ -0,0 +1,17 @@
package dev.zontreck.otemod.integrations;
import dev.zontreck.otemod.OTEMod;
import mezz.jei.api.IModPlugin;
import mezz.jei.api.JeiPlugin;
import net.minecraft.resources.ResourceLocation;
@JeiPlugin
public class JEI implements IModPlugin
{
@Override
public ResourceLocation getPluginUid() {
return new ResourceLocation(OTEMod.MOD_ID, "jei_plugin");
}
}

View file

@ -1,6 +1,6 @@
package dev.zontreck.shapedaionresources.items;
package dev.zontreck.otemod.items;
import dev.zontreck.shapedaionresources.ShapedAionResources;
import dev.zontreck.otemod.OTEMod;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraftforge.eventbus.api.IEventBus;
@ -9,7 +9,7 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
public class ModItems {
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ShapedAionResources.MOD_ID);
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, OTEMod.MOD_ID);
public static final RegistryObject<Item> AION_FRAGMENT = ITEMS.register("aion_fragment", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));

View file

@ -1,4 +1,4 @@
package dev.zontreck.shapedaionresources.ore;
package dev.zontreck.otemod.ore;
import java.util.List;

View file

@ -1,10 +1,10 @@
package dev.zontreck.shapedaionresources.ore;
package dev.zontreck.otemod.ore;
import java.util.ArrayList;
import java.util.List;
import dev.zontreck.shapedaionresources.ShapedAionResources;
import dev.zontreck.shapedaionresources.blocks.ModBlocks;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.blocks.ModBlocks;
import net.minecraft.core.Holder;
import net.minecraft.data.worldgen.features.FeatureUtils;
import net.minecraft.data.worldgen.features.OreFeatures;
@ -18,7 +18,6 @@ import net.minecraft.world.level.levelgen.feature.OreFeature;
import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
import net.minecraft.world.level.levelgen.placement.HeightRangePlacement;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraftforge.event.world.BiomeLoadingEvent;
public class OreGenerator {
public static final List<ConfiguredFeature<OreConfiguration, OreFeature>> OVERWORLD_ORES = new ArrayList();

View file

@ -1,5 +0,0 @@
package dev.zontreck.shapedaionresources.commands;
public class ModCommands {
}

View file

@ -15,13 +15,13 @@ license="GPL 2.0"
# A list of mods - how many allowed here is determined by the individual mod loader
[[mods]] #mandatory
# The modid of the mod
modId="shapedaionresources" #mandatory
modId="otemod" #mandatory
# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
# see the associated build.gradle script for how to populate this completely automatically during a build
version="${file.jarVersion}" #mandatory
# A display name for the mod
displayName="Shaped Aion Resources" #mandatory
displayName="OTEMod Resources" #mandatory
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
# A URL for the "homepage" for this mod, displayed in the mod UI
@ -34,22 +34,22 @@ description='''
The entire purpose of this mod is to add datapack resources that will be present on servers and single player worlds.
'''
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
[[dependencies.shapedaionresources]] #optional
[[dependencies.otemod]] #optional
# the modid of the dependency
modId="forge" #mandatory
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
versionRange="[40,)" #mandatory
versionRange="[41,)" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER
side="BOTH"
# Here's another dependency
[[dependencies.shapedaionresources]]
[[dependencies.otemod]]
modId="minecraft"
mandatory=true
# This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange="[1.18.2,1.19)"
versionRange="[1.19)"
ordering="NONE"
side="BOTH"

View file

@ -1,7 +1,7 @@
{
"variants": {
"": {
"model": "shapedaionresources:block/aion_block"
"model": "otemod:block/aion_block"
}
}
}

View file

@ -1,7 +1,7 @@
{
"variants": {
"": {
"model": "shapedaionresources:block/aion_ore_block"
"model": "otemod:block/aion_ore_block"
}
}
}

View file

@ -1,7 +1,7 @@
{
"variants": {
"": {
"model": "shapedaionresources:block/deepslate_aion_ore_block"
"model": "otemod:block/deepslate_aion_ore_block"
}
}
}

View file

@ -3,15 +3,15 @@
"itemGroup.refinedfabric.tools": "RefinedFabric Utilities",
"itemGroup.refinedfabric.blocks": "RefinedFabric Blocks",
"item.shapedaionresources.aion_ore": "Raw Aion Ore",
"item.shapedaionresources.aion_crystal": "Aion Crystal",
"item.shapedaionresources.aion_crystal.levels": "Stored XP: ",
"item.shapedaionresources.aion_crystal.empty": "* Crystal Is Empty *",
"item.shapedaionresources.aion_crystal.need_repair": "Aion Crystal must now be repaired",
"item.shapedaionresources.aion_crystal.durability": "Durability: ",
"item.shapedaionresources.aion_fragment": "Fragmented Aion Crystal",
"item.otemod.aion_ore": "Raw Aion Ore",
"item.otemod.aion_crystal": "Aion Crystal",
"item.otemod.aion_crystal.levels": "Stored XP: ",
"item.otemod.aion_crystal.empty": "* Crystal Is Empty *",
"item.otemod.aion_crystal.need_repair": "Aion Crystal must now be repaired",
"item.otemod.aion_crystal.durability": "Durability: ",
"item.otemod.aion_fragment": "Fragmented Aion Crystal",
"block.shapedaionresources.aion_ore_block": "Aion Ore",
"block.shapedaionresources.deepslate_aion_ore_block": "Deepslate Aion Ore",
"block.shapedaionresources.aion_block": "Aion Block"
"block.otemod.aion_ore_block": "Aion Ore",
"block.otemod.deepslate_aion_ore_block": "Deepslate Aion Ore",
"block.otemod.aion_block": "Aion Block"
}

View file

@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "shapedaionresources:block/aion_block"
"all": "otemod:block/aion_block"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "shapedaionresources:block/aion_ore_block"
"all": "otemod:block/aion_ore_block"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "shapedaionresources:block/deepslate_aion_ore_block"
"all": "otemod:block/deepslate_aion_ore_block"
}
}

View file

@ -1,3 +1,3 @@
{
"parent": "shapedaionresources:block/aion_block"
"parent": "otemod:block/aion_block"
}

View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "shapedaionresources:item/aion_crystal"
"layer0": "otemod:item/aion_crystal"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "shapedaionresources:item/aion_fragment"
"layer0": "otemod:item/aion_fragment"
}
}

View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "shapedaionresources:item/aion_ore"
"layer0": "otemod:item/aion_ore"
}
}

View file

@ -1,3 +1,3 @@
{
"parent": "shapedaionresources:block/aion_ore_block"
"parent": "otemod:block/aion_ore_block"
}

View file

@ -1,3 +1,3 @@
{
"parent": "shapedaionresources:block/deepslate_aion_ore_block"
"parent": "otemod:block/deepslate_aion_ore_block"
}

View file

@ -1,7 +0,0 @@
{
"origins": [
"shapedaionresources:flutterling"
],
"enabled": true,
"allow_random": true
}

View file

@ -7,14 +7,14 @@
],
"key": {
"C": {
"item": "shapedaionresources:aion_crystal"
"item": "otemod:aion_crystal"
},
"N": {
"item": "minecraft:nether_star"
}
},
"result": {
"item": "shapedaionresources:aion_block",
"item": "otemod:aion_block",
"count": 1
}
}

View file

@ -7,14 +7,14 @@
],
"key": {
"F": {
"item": "shapedaionresources:aion_fragment"
"item": "otemod:aion_fragment"
},
"G": {
"item": "minecraft:emerald"
}
},
"result": {
"item": "shapedaionresources:aion_crystal",
"item": "otemod:aion_crystal",
"count": 1
}
}

View file

@ -0,0 +1,17 @@
{
"type": "minecraft:smelting",
"ingredient": [
{
"item": "otemod:aion_ore"
},
{
"item": "otemod:aion_ore_block"
},
{
"item": "otemod:deepslate_aion_ore_block"
}
],
"result": "otemod:aion_fragment",
"experience": 0.5,
"cookingtime": 25
}

View file

@ -1,23 +0,0 @@
{
"name": "Flutterling",
"description": "Flutterlings are tiny, moth-like fae creatures that love living in the hollows of trees. While they are weak and fragile, they can easily climb or fly out of danger when faced with it.",
"powers": [
"shapedaionresources:flutter",
"shapedaionresources:night_vision",
"shapedaionresources:flight",
"shapedaionresources:nocturnal",
"shapedaionresources:soundeffect",
"shapedaionresources:armor_allergy",
"shapedaionresources:armor_weight",
"shapedaionresources:fae_weakness",
"shapedaionresources:soul_lantern_allergy",
"shapedaionresources:tiny_fae",
"extraorigins:nimble",
"extraorigins:small_appetite",
"origins:climbing"
],
"icon": {
"item": "minecraft:feather"
},
"impact": 3
}

View file

@ -1,31 +0,0 @@
{
"name": "Armor allergy",
"description": "You are very small, and struggle to wear armor without being weighed down. Additionally, you are allergic to pure iron armor, and cannot wear it.",
"hidden": true,
"type": "origins:conditioned_restrict_armor",
"head": {
"type": "origins:ingredient",
"ingredient": {
"item": "minecraft:iron_helmet"
}
},
"chest": {
"type": "origins:ingredient",
"ingredient": {
"item": "minecraft:iron_chestplate"
}
},
"legs": {
"type": "origins:ingredient",
"ingredient": {
"item": "minecraft:iron_leggings"
}
},
"feet": {
"type": "origins:ingredient",
"ingredient": {
"item": "minecraft:iron_boots"
}
},
"tick_rate": 80
}

View file

@ -1,26 +0,0 @@
{
"name": "Armor Difficulties",
"description": "You are very small, and struggle to wear armor without being weighed down. Additionally, you are allergic to pure iron armor, and cannot wear it.",
"type": "origins:conditioned_restrict_armor",
"head": {
"type": "origins:armor_value",
"comparison": ">",
"compare_to": 2
},
"chest": {
"type": "origins:armor_value",
"comparison": ">",
"compare_to": 6
},
"legs": {
"type": "origins:armor_value",
"comparison": ">",
"compare_to": 5
},
"feet": {
"type": "origins:armor_value",
"comparison": ">",
"compare_to": 2
},
"tick_rate": 80
}

View file

@ -1,27 +0,0 @@
{
"name": "Fae Weakness",
"description": "Your fae nature means that you are allergic to some variants of iron. The heat of fire within lanterns make you feel weak.",
"condition": {
"type": "origins:block_in_radius",
"block_condition": {
"type": "origins:block",
"block": "minecraft:lantern"
},
"radius": 1,
"shape": "cube",
"comparison": ">=",
"compare_to": 1
},
"type": "origins:action_over_time",
"interval": 3,
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:mining_fatigue",
"duration": 10,
"amplifier": 1,
"show_particles": false,
"show_icon": false
}
}
}

View file

@ -1,7 +0,0 @@
{
"name": "Weak Wings",
"description": "While you can glide like the best of them, you can only fly with some effort, fluttering to slowly gain altitude while gliding.",
"type": "origins:elytra_flight",
"render_elytra": true,
"texture_location": "shapedaionresources:textures/entity/elytra.png"
}

View file

@ -1,20 +0,0 @@
{
"name": "flutter",
"hidden": true,
"type": "origins:active_self",
"entity_action": {
"type": "origins:add_velocity",
"y": 0.3,
"space": "world",
"client": true,
"server": true
},
"cooldown": 10,
"hud_render": {
"should_render": false
},
"key": {
"key": "key.origins.secondary_active",
"continuous": true
}
}

View file

@ -1,7 +0,0 @@
{
"name": "Night Vision",
"description": "Your big eyes have adapted to see within dark spaces.",
"hidden": true,
"type": "origins:night_vision",
"strength": 1
}

View file

@ -1,27 +0,0 @@
{
"name": "Nocturnal",
"description": "You are naturally nocturnal, and find yourself weaker when in the extreme brightness of sunlight. On the other hand, your adaptation to darkness means that you can see clearly even in pitch black.",
"condition": {
"type": "origins:and",
"conditions": [
{
"type": "origins:exposed_to_sun"
}
]
},
"type": "origins:stacking_status_effect",
"min_stacks": 0,
"max_stacks": 2,
"duration_per_stack": 30,
"tick_rate": 10,
"effects": [
{
"effect": "minecraft:weakness",
"duration": 100,
"amplifier": 0,
"is_ambient": true,
"show_particles": false,
"show_icon": true
}
]
}

View file

@ -1,28 +0,0 @@
{
"name": "lantern allergy",
"description": "Your fae nature means that you are allergic to some variants of iron. The heat of fire within lanterns make you feel weak.",
"hidden": true,
"condition": {
"type": "origins:block_in_radius",
"block_condition": {
"type": "origins:block",
"block": "minecraft:soul_lantern"
},
"radius": 1,
"shape": "cube",
"comparison": ">=",
"compare_to": 1
},
"type": "origins:action_over_time",
"interval": 3,
"entity_action": {
"type": "origins:apply_effect",
"effect": {
"effect": "minecraft:mining_fatigue",
"duration": 10,
"amplifier": 1,
"show_particles": false,
"show_icon": false
}
}
}

View file

@ -1,18 +0,0 @@
{
"hidden": true,
"type": "origins:active_self",
"entity_action": {
"type": "origins:play_sound",
"sound": "minecraft:entity.parrot.fly",
"volume": 1,
"pitch": 1
},
"cooldown": 10,
"hud_render": {
"should_render": false
},
"key": {
"key": "key.origins.secondary_active",
"continuous": true
}
}

View file

@ -1,53 +0,0 @@
{
"name": "Tiny Faerie",
"description": "You are tiny due to being a magical moth-like creature. You have only 5 hearts and less reach, and are only half a block tall.",
"type": "origins:multiple",
"modify_size": {
"type": "extraorigins:modify_size",
"scale": 0.25
},
"attribute_modifiers": {
"type": "origins:attribute",
"modifiers": [
{
"name": "Origin modifier",
"attribute": "minecraft:generic.max_health",
"operation": "addition",
"value": -10
},
{
"name": "Origin modifier",
"attribute": "minecraft:generic.attack_speed",
"operation": "addition",
"value": 0.5
},
{
"name": "Origin modifier",
"attribute": "minecraft:generic.movement_speed",
"operation": "addition",
"value": -0.015
},
{
"name": "Origin modifier",
"attribute": "reach-entity-attributes:attack_range",
"operation": "addition",
"value": -0.25
},
{
"name": "Origin modifier",
"attribute": "reach-entity-attributes:reach",
"operation": "addition",
"value": -1
}
]
},
"jump_modifier": {
"type": "origins:modify_jump",
"modifier": {
"name": "Origin modifier",
"operation": "multiply_total",
"value": -0.3333
}
}
}

View file

@ -1,17 +0,0 @@
{
"type": "minecraft:smelting",
"ingredient": [
{
"item": "shapedaionresources:aion_ore"
},
{
"item": "shapedaionresources:aion_ore_block"
},
{
"item": "shapedaionresources:deepslate_aion_ore_block"
}
],
"result": "shapedaionresources:aion_fragment",
"experience": 0.5,
"cookingtime": 25
}

View file

@ -1,20 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GGG",
"GDG",
"GGG"
],
"key": {
"D": {
"item": "minecraft:diamond"
},
"G": {
"item": "minecraft:gold_ingot"
}
},
"result": {
"item": "origins:orb_of_origin",
"count": 1
}
}

View file

@ -1,6 +1,6 @@
{
"pack": {
"description": "ShapedAionResources Modpack Resources",
"description": "OTEMod Resources",
"pack_format": 9
}
}