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 {
}