Publish changes to fix mod, and add vault limitations

This commit is contained in:
Aria 2023-02-23 07:27:38 -07:00
parent 19573bbd56
commit 553ff429f3
130 changed files with 211075 additions and 208965 deletions

View file

@ -114,11 +114,20 @@ repositories {
name = "ZNI Creations"
url = "https://maven.zontreck.dev"
}
maven {
// location of the maven that hosts JEI files
name = "Progwml6 maven"
url = "https://dvs1.progwml6.com/files/maven/"
}
maven {
name = "GeckoLib"
url = "https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/"
}
maven {
// location of a maven mirror for JEI files, as a fallback
name = "ModMaven"
url = "https://modmaven.dev"
}
}
dependencies {
@ -132,7 +141,7 @@ dependencies {
runtimeOnly fg.deobf("dev.zontreck:libzontreck:${mc_version}-${libz_version}")
implementation fg.deobf('software.bernie.geckolib:geckolib-forge-1.19:3.1.39')
implementation fg.deobf('software.bernie.geckolib:geckolib-forge-1.18:3.0.57')
//compileOnly "net.luckperms:api:${luckperms_version}"
// compile against the JEI API but do not include it at runtime
@ -140,8 +149,8 @@ dependencies {
// at runtime, use the full JEI jar
//runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
// Real mod deobf dependency examples - these get remapped to your current mappings
// compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
// runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") // Adds JEI API as a compile dependency
runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") // Adds the full JEI mod as a runtime dependency
// implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
// Examples using mod jars from ./libs
@ -154,7 +163,7 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/dependency_management.html
api 'curse.maven:mariadb-jdbc-561883:3586357'
runtimeOnly fg.deobf("curse.maven:mekanism-268560:4385637")
runtimeOnly fg.deobf("curse.maven:mekanism-268560:3875976")
}
// Example for how to get properties into the manifest for reading at runtime.

View file

@ -3,11 +3,11 @@
org.gradle.jvmargs=-Xmx8G
org.gradle.daemon=false
my_version=1.3.7.3
my_version=1.3.7.4
mc_version=1.18.2
forge_version=40.2.1
libz_version=1.0.4.10
libz_version=1.0.4.13
parchment_version=2022.11.06
jei_version=10.2.1.1002
jei_version=10.2.1.283
# luckperms_version=5.4

View file

@ -1,4 +1,4 @@
version:3120
version:2975
autoJump:false
autoSuggestions:true
chatColors:true
@ -12,7 +12,6 @@ invertYMouse:false
realmsNotifications:true
reducedDebugInfo:false
showSubtitles:true
directionalAudio:false
touchscreen:false
fullscreen:false
bobView:true
@ -24,7 +23,6 @@ mouseSensitivity:0.5
fov:0.0
screenEffectScale:1.0
fovEffectScale:1.0
darknessEffectScale:1.0
gamma:1.0
renderDistance:12
simulationDistance:12
@ -32,11 +30,12 @@ entityDistanceScaling:1.0
guiScale:4
particles:0
maxFps:120
difficulty:2
graphicsMode:1
ao:2
prioritizeChunkUpdates:0
biomeBlendRadius:2
renderClouds:"true"
renderClouds:false
resourcePacks:[]
incompatibleResourcePacks:[]
lastServer:127.0.0.1
@ -60,7 +59,7 @@ chatScale:1.0
chatWidth:1.0
mipmapLevels:4
useNativeTransport:true
mainHand:"right"
mainHand:right
attackIndicator:1
narrator:0
tutorialStep:none
@ -75,8 +74,6 @@ hideBundleTutorial:false
syncChunkWrites:true
showAutosaveIndicator:true
allowServerListing:true
chatPreview:1
onlyShowSecureChat:false
key_key.attack:key.mouse.left
key_key.use:key.mouse.right
key_key.forward:key.keyboard.w
@ -111,6 +108,35 @@ key_key.hotbar.6:key.keyboard.6
key_key.hotbar.7:key.keyboard.7
key_key.hotbar.8:key.keyboard.8
key_key.hotbar.9:key.keyboard.9
key_key.jei.toggleOverlay:key.keyboard.o:CONTROL
key_key.jei.focusSearch:key.keyboard.f:CONTROL
key_key.jei.previousPage:key.keyboard.unknown
key_key.jei.nextPage:key.keyboard.unknown
key_key.jei.toggleBookmarkOverlay:key.keyboard.unknown
key_key.jei.bookmark:key.keyboard.a
key_key.jei.showRecipe:key.keyboard.r
key_key.jei.showRecipe2:key.mouse.left
key_key.jei.showUses:key.keyboard.u
key_key.jei.showUses2:key.mouse.right
key_key.jei.clearSearchBar:key.mouse.right
key_key.jei.previousSearch:key.keyboard.up
key_key.jei.nextSearch:key.keyboard.down
key_key.jei.toggleCheatMode:key.keyboard.unknown
key_key.jei.cheatOneItem:key.mouse.left
key_key.jei.cheatOneItem2:key.mouse.right
key_key.jei.cheatItemStack:key.mouse.left:SHIFT
key_key.jei.cheatItemStack2:key.mouse.middle
key_key.jei.toggleCheatModeConfigButton:key.mouse.left:CONTROL
key_key.jei.toggleEditMode:key.keyboard.unknown
key_key.jei.toggleHideIngredient:key.mouse.left:CONTROL
key_key.jei.toggleWildcardHideIngredient:key.mouse.right:CONTROL
key_key.jei.recipeBack:key.keyboard.backspace
key_key.jei.previousRecipePage:key.keyboard.page.up
key_key.jei.nextRecipePage:key.keyboard.page.down
key_key.jei.previousCategory:key.keyboard.page.up:SHIFT
key_key.jei.nextCategory:key.keyboard.page.down:SHIFT
key_key.jei.closeRecipeGui:key.keyboard.escape
key_key.jei.copy.recipe.id:key.keyboard.unknown
key_key.mekanism.mode:key.keyboard.n
key_key.mekanism.head_mode:key.keyboard.v
key_key.mekanism.chest_mode:key.keyboard.g

View file

@ -1,5 +1,5 @@
#Minecraft server properties
#Mon Feb 13 02:31:07 MST 2023
#Thu Feb 23 07:24:56 MST 2023
allow-flight=false
allow-nether=true
broadcast-console-to-ops=true

View file

@ -10,8 +10,6 @@ import java.util.Map;
import java.util.Set;
import com.mojang.logging.LogUtils;
import com.mojang.serialization.Codec;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.client.renderer.entity.EntityRenderers;
import net.minecraft.network.chat.Component;
@ -20,9 +18,6 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@ -35,8 +30,6 @@ import net.minecraftforge.event.entity.item.ItemExpireEvent;
import net.minecraftforge.event.server.ServerStartedEvent;
import net.minecraftforge.event.server.ServerStoppingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import software.bernie.geckolib3.GeckoLib;
import org.slf4j.Logger;
@ -55,7 +48,6 @@ import dev.zontreck.otemod.database.Database.DatabaseConnectionException;
import dev.zontreck.otemod.enchantments.ModEnchantments;
import dev.zontreck.otemod.entities.ModEntityTypes;
import dev.zontreck.otemod.entities.monsters.client.PossumRenderer;
import dev.zontreck.otemod.events.EventHandler;
import dev.zontreck.otemod.events.LoreHandlers;
import dev.zontreck.otemod.implementation.inits.ModMenuTypes;
import dev.zontreck.otemod.implementation.scrubber.ItemScrubberScreen;

View file

@ -36,6 +36,10 @@ public class ModBlocks {
public static final RegistryObject<Item> ETERNIUM_ORE_BLOCK_I = ITEMS.register("eternium_ore_block", () -> new BlockItem(ETERNIUM_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Block> VAULT_STEEL_ORE_BLOCK = BLOCKS.register("vault_steel_ore_block", ()->new Block(BlockBehaviour.Properties.of(Material.METAL).requiresCorrectToolForDrops().strength(8F).explosionResistance(1200).destroyTime(100)));
public static final RegistryObject<Item> VAULT_STEEL_ORE_BLOCK_I = ITEMS.register("vault_steel_ore_block", ()->new BlockItem(VAULT_STEEL_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
//#region TINKERS BLOCKS
public static final RegistryObject<Block> COBALT_ORE_BLOCK = BLOCKS.register("cobalt_ore", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).sound(SoundType.NETHER_ORE).requiresCorrectToolForDrops().strength(10.0F)));
@ -46,25 +50,10 @@ public class ModBlocks {
public static final RegistryObject<Item> RAW_COBALT_ORE_ITEM = ITEMS.register("raw_cobalt_ore", ()->new BlockItem(RAW_COBALT_ORE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
public static final RegistryObject<Block> GOLD_BARS = BLOCKS.register("gold_bars", ()-> new IronBarsBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.NONE).requiresCorrectToolForDrops().strength(3.0F, 6.0F).sound(SoundType.METAL).noOcclusion()));
public static final RegistryObject<Item> GOLD_BARS_I = ITEMS.register("gold_bars", ()-> new BlockItem(GOLD_BARS.get(), new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
public static final RegistryObject<Block> COBALT_BLOCK = BLOCKS.register("cobalt_block", ()-> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BLUE).requiresCorrectToolForDrops().strength(3.0F, 6.0F).sound(SoundType.METAL)));
public static final RegistryObject<Item> COBALT_BLOCK_I = ITEMS.register("cobalt_block", ()-> new BlockItem(COBALT_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
public static final RegistryObject<Block> NETHER_GROUT = BLOCKS.register("nether_grout", ()-> new Block(BlockBehaviour.Properties.of(Material.SAND, MaterialColor.NONE).strength(3.0F).friction(0.8F).sound(SoundType.SOUL_SOIL)));
public static final RegistryObject<Item> NETHER_GROUT_I = ITEMS.register("nether_grout", ()-> new BlockItem(NETHER_GROUT.get(), new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
public static final BlockBehaviour.Properties SCORCHED_BASE = BlockBehaviour.Properties.of(Material.STONE, MaterialColor.TERRACOTTA_BROWN).requiresCorrectToolForDrops().strength(2.5F, 8.0F);
public static final BlockBehaviour.Properties SCORCHED_BASE_NONSOLID = SCORCHED_BASE.noOcclusion();
public static final RegistryObject<Block> SCORCHED_TABLE = BLOCKS.register("scorched_table", ()-> new Block(SCORCHED_BASE_NONSOLID));
public static final RegistryObject<Item> SCORCHED_TABLE_I = ITEMS.register("scorched_table", ()-> new BlockItem(SCORCHED_TABLE.get(), new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
//#endregion

View file

@ -53,7 +53,7 @@ public class ChatServerOverride {
has_profile=true;
OTEMod.PROFILES.put(ev.getEntity().getStringUUID(), new Profile(rs.getString("username"), rs.getString("prefix"), rs.getString("nickname"), rs.getString("name_color"), ev.getEntity().getStringUUID(), rs.getString("prefix_color"), rs.getString("chat_color"), rs.getBoolean("flying")));
OTEMod.PROFILES.put(ev.getEntity().getStringUUID(), new Profile(rs.getString("username"), rs.getString("prefix"), rs.getString("nickname"), rs.getString("name_color"), ev.getEntity().getStringUUID(), rs.getString("prefix_color"), rs.getString("chat_color"), rs.getBoolean("flying"), rs.getInt("vaults")));
}
if(!has_profile)

View file

@ -85,14 +85,8 @@ public class HomeCommand {
position = dest.Position.asMinecraftVector();
rot = dest.Rotation.asMinecraftVector();
ServerLevel dimL=null;
try {
dimL = (ServerLevel)dest.getActualDimension();
} catch (InvalidSideException e) {
e.printStackTrace();
return 1;
}
ServerLevel dimL = (ServerLevel)dest.getActualDimension();
TeleportActioner.ApplyTeleportEffect(p);
// Instantiate a Teleport Runner

View file

@ -5,6 +5,7 @@ import com.mojang.brigadier.CommandDispatcher;
import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.chat.HoverTip;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.chat.ChatServerOverride;
import dev.zontreck.otemod.configs.Profile;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
@ -43,11 +44,11 @@ public class ShareItemInChatCommand {
Profile prof = Profile.get_profile_of(play.getUUID().toString());
MutableComponent component = new TextComponent(OTEMod.OTEPrefix + ChatColor.doColors(" !Dark_Green!" + is.getDisplayName()+" !White!-!Dark_Purple! Hover here to see the item that "+prof.name_color+prof.nickname+"!Dark_Purple! shared"));
MutableComponent component = new TextComponent(OTEMod.OTEPrefix).append(is.getDisplayName()).append(new TextComponent(ChatColor.doColors(" !White!-!Dark_Purple! Hover here to see the item that "+prof.name_color+prof.nickname+"!Dark_Purple! shared")));
Style style = Style.EMPTY.withFont(Style.DEFAULT_FONT);
component = component.withStyle(style.withHoverEvent(HoverTip.getItem(is)));
play.server.sendMessage(component, play.getUUID());
ChatServerOverride.broadcast(component, OTEMod.THE_SERVER);
}else {
return 1;

View file

@ -67,7 +67,7 @@ public class RTPCommand {
if(b.isAir()){
if(b2.isAir()){
if(!b3.isAir())
if(!b3.isAir() && !b3.is(Blocks.BEDROCK))
{
// Check names
boolean valid=true;

View file

@ -55,13 +55,8 @@ public class WarpCommand {
TeleportDestination dest = new TeleportDestination(NbtUtils.snbtToStructure(rs.getString("teleporter")));
ServerLevel dimL = null;
try{
dimL=(ServerLevel) dest.getActualDimension();
}catch(InvalidSideException e)
{
return 1;
}
ServerLevel dimL=(ServerLevel) dest.getActualDimension();
final int type = rs.getInt("warptype");
final ServerLevel f_dim = dimL;

View file

@ -31,6 +31,7 @@ public class OTEServerConfig {
public static final ForgeConfigSpec.BooleanValue DEBUG_HEALER;
public static final ForgeConfigSpec.ConfigValue<Integer> TIME_BETWEEN_BLOCKS;
public static final ForgeConfigSpec.ConfigValue<Integer> MAX_TRIES_HEAL;
public static final ForgeConfigSpec.ConfigValue<Integer> MAX_VAULTS;
public static final ForgeConfigSpec.ConfigValue<List<String>> EXCLUDE_DIMS;
@ -47,6 +48,7 @@ public class OTEServerConfig {
BUILDER.push("OTE");
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);
SPAWN_EGG_CHANCE = BUILDER.comment("What is the chance for a spawn egg to drop from a mob when looting 3 is used? Default: 0.25").define("spawn_egg_chance", 0.25);
MAX_VAULTS = BUILDER.comment("What is the maximum number of vaults a player may have available? (0 is unlimited)").define("max_vaults", 0);
BUILDER.pop();
BUILDER.push("DATABASE");

View file

@ -17,8 +17,9 @@ public class Profile {
public String prefix_color;
public String chat_color;
public Boolean flying;
public int available_vaults;
public Profile(String username, String prefix, String nickname, String name_color, String ID, String prefix_color, String chat_color, Boolean isFlying) {
public Profile(String username, String prefix, String nickname, String name_color, String ID, String prefix_color, String chat_color, Boolean isFlying, int vaults) {
this.username = username;
this.prefix = prefix;
this.nickname = nickname;
@ -27,6 +28,7 @@ public class Profile {
this.prefix_color = prefix_color;
this.chat_color = chat_color;
this.flying=isFlying;
this.available_vaults=vaults;
}
@ -43,7 +45,7 @@ public class Profile {
public static Profile factory(ServerPlayer play)
{
Profile p = new Profile(play.getName().getString(), "Member", play.getDisplayName().getString(), ChatColor.GREEN, play.getStringUUID(), ChatColor.AQUA, ChatColor.WHITE, false);
Profile p = new Profile(play.getName().getString(), "Member", play.getDisplayName().getString(), ChatColor.GREEN, play.getStringUUID(), ChatColor.AQUA, ChatColor.WHITE, false, 0);
return p;
}
@ -51,7 +53,7 @@ public class Profile {
{
// Send player to server!
Connection con = OTEMod.DB.getConnection();
String SQL = "REPLACE INTO `profiles` (username, uuid, prefix, nickname, name_color, prefix_color, chat_color, flying) values (?, ?, ?, ?, ?, ?, ?, ?);";
String SQL = "REPLACE INTO `profiles` (username, uuid, prefix, nickname, name_color, prefix_color, chat_color, flying, vaults) values (?, ?, ?, ?, ?, ?, ?, ?, ?);";
try {
PreparedStatement pstat = con.prepareStatement(SQL);
pstat.setString(1, username);
@ -62,10 +64,10 @@ public class Profile {
pstat.setString(6, prefix_color);
pstat.setString(7, chat_color);
pstat.setBoolean(8, flying);
pstat.setInt(9, available_vaults);
pstat.execute();
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}

View file

@ -9,17 +9,17 @@ public class PossumModel extends AnimatedGeoModel<PossumEntity>
{
@Override
public ResourceLocation getAnimationResource(PossumEntity animatable) {
public ResourceLocation getAnimationFileLocation(PossumEntity animatable) {
return new ResourceLocation(OTEMod.MOD_ID, "animations/possum.animation.json");
}
@Override
public ResourceLocation getModelResource(PossumEntity object) {
public ResourceLocation getModelLocation(PossumEntity object) {
return new ResourceLocation(OTEMod.MOD_ID, "geo/possum.geo.json");
}
@Override
public ResourceLocation getTextureResource(PossumEntity object) {
public ResourceLocation getTextureLocation(PossumEntity object) {
return new ResourceLocation(OTEMod.MOD_ID, "textures/entity/possum_texture.png");
}

View file

@ -5,6 +5,8 @@ import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.enchantments.MobEggEnchantment;
import dev.zontreck.otemod.enchantments.ModEnchantments;
import dev.zontreck.otemod.items.tags.ItemStatType;
import dev.zontreck.otemod.ore.OreGenerator;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraft.nbt.CompoundTag;
@ -15,17 +17,21 @@ import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraftforge.common.ForgeSpawnEggItem;
import net.minecraftforge.event.LootTableLoadEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.world.BiomeLoadingEvent;
@Mod.EventBusSubscriber(modid=OTEMod.MOD_ID)
public class EventHandler {
/*
@SubscribeEvent(priority = EventPriority.HIGH)
public static void addOresToBiomes(final BiomeLoadingEvent ev){
//ShapedAionResources.LOGGER.info("Biome loading event called. Registering aion ores");
OTEMod.LOGGER.info("/!\\ Registering OTEMod ores /!\\");
OreGenerator.generateOres(ev);
}*/
}
@SubscribeEvent
public void onEntityKilled(LivingDropsEvent ev){

View file

@ -19,8 +19,6 @@ public class ModItems {
public static final RegistryObject<Item> IHAN_CRYSTAL = ITEMS.register("ihan_crystal", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> ETERNIUM_DUST = ITEMS.register("eternium_dust", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> AURORA_COMPOUND = ITEMS.register("aurora_compound", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
@ -29,9 +27,6 @@ public class ModItems {
public static final RegistryObject<Item> RAW_COBALT = ITEMS.register("raw_cobalt", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> COBALT_NUGGET = ITEMS.register("cobalt_nugget", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> COBALT_INGOT = ITEMS.register("cobalt_ingot", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> PATTERN = ITEMS.register("pattern", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> SCORCHED_BRICK = ITEMS.register("scorched_brick", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> COPPER_CAN = ITEMS.register("copper_can", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(16)));
public static final RegistryObject<Item> ETERNIUM_INGOT = ITEMS.register("eternium_ingot", ()-> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MATERIALS)));
@ -43,6 +38,21 @@ public class ModItems {
public static final RegistryObject<Item> SCRUBBER_FRAME = ITEMS.register("scrubber_frame", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULTSTEEL_INGOT = ITEMS.register("vault_steel_ingot", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_BL = ITEMS.register("vault_fragment_lower_left", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_LC = ITEMS.register("vault_fragment_lower", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_BR = ITEMS.register("vault_fragment_lower_right", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_L = ITEMS.register("vault_fragment_left", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_R = ITEMS.register("vault_fragment_right", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_UR = ITEMS.register("vault_fragment_upper_right", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_UL = ITEMS.register("vault_fragment_upper_left", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_U = ITEMS.register("vault_fragment_upper", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_FRAG_C = ITEMS.register("vault_fragment_center", () -> new SimpleFoiledItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT = ITEMS.register("vault", () -> new VaultItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> VAULT_RAW_ORE = ITEMS.register("raw_vault_steel_ore", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(64)));
public static final RegistryObject<Item> POSSUM_SPAWN_EGG = ITEMS.register("possum_spawn_egg", () -> new ForgeSpawnEggItem(ModEntityTypes.POSSUM, 0x938686, 0xc68787, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));

View file

@ -0,0 +1,78 @@
package dev.zontreck.otemod.items;
import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.items.lore.LoreContainer;
import dev.zontreck.libzontreck.items.lore.LoreEntry;
import dev.zontreck.otemod.OTEMod;
import dev.zontreck.otemod.chat.ChatServerOverride;
import dev.zontreck.otemod.configs.OTEServerConfig;
import dev.zontreck.otemod.configs.Profile;
import dev.zontreck.otemod.events.LoreHandlers;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.SimpleFoiledItem;
import net.minecraft.world.level.Level;
public class VaultItem extends Item
{
@Override
public boolean isFoil(ItemStack pStack) {
return true;
}
@Override
public Item asItem()
{
return this;
}
public VaultItem(Properties pProperties) {
super(pProperties);
//TODO Auto-generated constructor stub
}
@Override
public InteractionResultHolder<ItemStack> use(Level pLevel, Player pPlayer, InteractionHand pUsedHand)
{
OTEMod.LOGGER.info("Vault item is being used");
if(!pLevel.isClientSide && pUsedHand == InteractionHand.MAIN_HAND)
{
ItemStack is = pPlayer.getItemInHand(pUsedHand);
Profile p = Profile.get_profile_of(pPlayer.getStringUUID());
if(OTEServerConfig.MAX_VAULTS.get()>0)
{
if(p.available_vaults >= OTEServerConfig.MAX_VAULTS.get())
{
ChatServerOverride.broadcastTo(pPlayer.getUUID(), new TextComponent(ChatColor.doColors(OTEMod.OTEPrefix+" !Dark_Red!You cannot activate anymore vaults due to the maximum set by the server admin")), OTEMod.THE_SERVER);
return InteractionResultHolder.pass(is);
} else {
p.available_vaults++;
p.commit();
ChatServerOverride.broadcastTo(pPlayer.getUUID(), new TextComponent(ChatColor.doColors(OTEMod.OTEPrefix+" !Dark_Green!You now have "+String.valueOf(p.available_vaults)+" available vaults")), OTEMod.THE_SERVER);
pPlayer.setItemInHand(pUsedHand, new ItemStack(Items.AIR));
return InteractionResultHolder.consume(is);
}
}else {
p.available_vaults++;
p.commit();
ChatServerOverride.broadcastTo(pPlayer.getUUID(), new TextComponent(ChatColor.doColors(OTEMod.OTEPrefix+" !Dark_Green!You now have "+String.valueOf(p.available_vaults)+" available vaults")), OTEMod.THE_SERVER);
pPlayer.setItemInHand(pUsedHand, new ItemStack(Items.AIR));
return InteractionResultHolder.consume(is);
}
}
return super.use(pLevel, pPlayer, pUsedHand);
}
}

View file

@ -0,0 +1,24 @@
package dev.zontreck.otemod.ore;
import java.util.List;
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
import net.minecraft.world.level.levelgen.placement.CountPlacement;
import net.minecraft.world.level.levelgen.placement.InSquarePlacement;
import net.minecraft.world.level.levelgen.placement.PlacementModifier;
import net.minecraft.world.level.levelgen.placement.RarityFilter;
public class ModdedOrePlacement {
public static List<PlacementModifier> orePlacement(PlacementModifier p_195347_, PlacementModifier p_195348_) {
return List.of(p_195347_, InSquarePlacement.spread(), p_195348_, BiomeFilter.biome());
}
public static List<PlacementModifier> commonOrePlacement(int p_195344_, PlacementModifier p_195345_) {
return orePlacement(CountPlacement.of(p_195344_), p_195345_);
}
public static List<PlacementModifier> rareOrePlacement(int p_195350_, PlacementModifier p_195351_) {
return orePlacement(RarityFilter.onAverageOnceEvery(p_195350_), p_195351_);
}
}

View file

@ -0,0 +1,56 @@
package dev.zontreck.otemod.ore;
import java.util.ArrayList;
import java.util.List;
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;
import net.minecraft.data.worldgen.placement.PlacementUtils;
import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.VerticalAnchor;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.Feature;
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();
public static final List<OreConfiguration.TargetBlockState> OVERWORLD_ETERNIUM_ORE = List.of(OreConfiguration.target(OreFeatures.STONE_ORE_REPLACEABLES, ModBlocks.ETERNIUM_ORE_BLOCK.get().defaultBlockState()), OreConfiguration.target(OreFeatures.DEEPSLATE_ORE_REPLACEABLES, ModBlocks.DEEPSLATE_ETERNIUM_ORE_BLOCK.get().defaultBlockState()));
public static final List<OreConfiguration.TargetBlockState> OVERWORLD_VAULTSTEEL_ORE = List.of(OreConfiguration.target(OreFeatures.DEEPSLATE_ORE_REPLACEABLES, ModBlocks.VAULT_STEEL_ORE_BLOCK.get().defaultBlockState()));
public static final Holder<ConfiguredFeature<OreConfiguration, ?>> ETERNIUM_ORE = FeatureUtils.register("eternium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ETERNIUM_ORE, 8));
public static final Holder<ConfiguredFeature<OreConfiguration, ?>> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 6));
public static final Holder<PlacedFeature> ETERNIUM_ORE_PLACED = PlacementUtils.register("eternium_ore_placed",
ETERNIUM_ORE, ModdedOrePlacement.commonOrePlacement(3, // VeinsPerChunk
HeightRangePlacement.triangle(VerticalAnchor.absolute(-20), VerticalAnchor.absolute(20))));
public static final Holder<PlacedFeature> VAULT_STEEL_ORE_PLACED = PlacementUtils.register("vaultsteel_ore_placed", VAULTSTEEL_ORE, ModdedOrePlacement.rareOrePlacement(4, // Veins per chunk
HeightRangePlacement.triangle(VerticalAnchor.absolute(-63), VerticalAnchor.absolute(-50))));
//public static final Holder<PlacedFeature> DEEPSLATE_AION_ORE_PLACED = PlacementUtils.register("deepslate_aion_ore_placed",
// DEEPSLATE_AION_ORE, ModdedOrePlacement.commonOrePlacement(3, // VeinsPerChunk
// HeightRangePlacement.triangle(VerticalAnchor.aboveBottom(-20), VerticalAnchor.aboveBottom(0))));
public static void generateOres(final BiomeLoadingEvent ev)
{
List<Holder<PlacedFeature>> base = ev.getGeneration().getFeatures(GenerationStep.Decoration.UNDERGROUND_ORES);
//ShapedAionResources.LOGGER.info("Register: AION_ORE");
base.add(ETERNIUM_ORE_PLACED);
base.add(VAULT_STEEL_ORE_PLACED);
//base.add(DEEPSLATE_AION_ORE_PLACED);
}
}

View file

@ -76,13 +76,8 @@ public class BlockContainerList {
storedBlock.tick();
if(storedBlock.isExpired()){
WorldPosition wp = storedBlock.getWorldPosition();
BlockState bs=null;
try {
bs = wp.getActualDimension().getBlockState(wp.Position.asBlockPos());
} catch (InvalidSideException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
BlockState bs = wp.getActualDimension().getBlockState(wp.Position.asBlockPos());
if(bs.is(storedBlock.getState().getBlock()) || storedBlock.getTries() >= OTEServerConfig.MAX_TRIES_HEAL.get())
{

View file

@ -24,12 +24,8 @@ public class HealRunner implements Runnable
BlockToSet = sb;
}
public static void scheduleHeal(StoredBlock sb){
try {
sb.getWorldPosition().getActualDimension().getServer().execute(new HealRunner(sb));
} catch (InvalidSideException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
sb.getWorldPosition().getActualDimension().getServer().execute(new HealRunner(sb));
}
@Override
public void run()
@ -38,14 +34,8 @@ public class HealRunner implements Runnable
//BlockSnapshot bs = BlockSnapshot.create(level.dimension(), level, sb.getPos());
//BlockState current = level.getBlockState(sb.getPos());
ServerLevel level=null;
try {
level = (ServerLevel) BlockToSet.getWorldPosition().getActualDimension();
} catch (InvalidSideException e) {
// TODO Auto-generated catch block
e.printStackTrace();
return;
}
ServerLevel level = (ServerLevel) BlockToSet.getWorldPosition().getActualDimension();
BlockState nState = Block.updateFromNeighbourShapes(BlockToSet.getState(), level, BlockToSet.getPos());
level.setBlock(BlockToSet.getPos(), nState, Block.UPDATE_CLIENTS); // no update?

View file

@ -19,7 +19,7 @@ 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="1.3.7.3" #mandatory
version="1.3.7.4" #mandatory
# A display name for the mod
displayName="OTEMod" #mandatory
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
@ -56,6 +56,6 @@ This mod is a work in progress and is planned to add a procedural adventure syst
[[dependencies.otemod]]
modId="libzontreck"
mandatory=true
versionRange="[1.0.4.9,1.0.5.0]"
versionRange="[1.0.4.13,1.0.5.0]"
ordering="NONE"
side="BOTH"

View file

@ -1,125 +1,124 @@
{
"variants": {
"facing=east,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom_left"
},
"facing=east,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_left_open",
"y": 90
},
"facing=east,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_right"
},
"facing=east,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom_right_open",
"y": 270
},
"facing=east,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top_left"
},
"facing=east,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_left_open",
"y": 90
},
"facing=east,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_right"
},
"facing=east,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top_right_open",
"y": 270
},
"facing=north,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom_left",
"y": 270
},
"facing=north,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_left_open"
},
"facing=north,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_right",
"y": 270
},
"facing=north,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom_right_open",
"y": 180
},
"facing=north,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top_left",
"y": 270
},
"facing=north,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_left_open"
},
"facing=north,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_right",
"y": 270
},
"facing=north,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top_right_open",
"y": 180
},
"facing=south,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom_left",
"y": 90
},
"facing=south,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_left_open",
"y": 180
},
"facing=south,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_right",
"y": 90
},
"facing=south,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom_right_open"
},
"facing=south,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top_left",
"y": 90
},
"facing=south,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_left_open",
"y": 180
},
"facing=south,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_right",
"y": 90
},
"facing=south,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top_right_open"
},
"facing=west,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom_left",
"y": 180
},
"facing=west,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_left_open",
"y": 270
},
"facing=west,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_right",
"y": 180
},
"facing=west,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom_right_open",
"y": 90
},
"facing=west,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top_left",
"y": 180
},
"facing=west,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_left_open",
"y": 270
},
"facing=west,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_right",
"y": 180
},
"facing=west,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top_right_open",
"y": 90
}
"variants": {
"facing=east,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom"
},
"facing=east,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_hinge",
"y": 90
},
"facing=east,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_hinge"
},
"facing=east,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom",
"y": 270
},
"facing=east,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top"
},
"facing=east,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_hinge",
"y": 90
},
"facing=east,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_hinge"
},
"facing=east,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top",
"y": 270
},
"facing=north,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom",
"y": 270
},
"facing=north,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_hinge"
},
"facing=north,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_hinge",
"y": 270
},
"facing=north,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom",
"y": 180
},
"facing=north,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top",
"y": 270
},
"facing=north,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_hinge"
},
"facing=north,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_hinge",
"y": 270
},
"facing=north,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top",
"y": 180
},
"facing=south,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom",
"y": 90
},
"facing=south,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_hinge",
"y": 180
},
"facing=south,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_hinge",
"y": 90
},
"facing=south,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom"
},
"facing=south,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top",
"y": 90
},
"facing=south,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_hinge",
"y": 180
},
"facing=south,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_hinge",
"y": 90
},
"facing=south,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top"
},
"facing=west,half=lower,hinge=left,open=false": {
"model": "otemod:block/aurora_door_bottom",
"y": 180
},
"facing=west,half=lower,hinge=left,open=true": {
"model": "otemod:block/aurora_door_bottom_hinge",
"y": 270
},
"facing=west,half=lower,hinge=right,open=false": {
"model": "otemod:block/aurora_door_bottom_hinge",
"y": 180
},
"facing=west,half=lower,hinge=right,open=true": {
"model": "otemod:block/aurora_door_bottom",
"y": 90
},
"facing=west,half=upper,hinge=left,open=false": {
"model": "otemod:block/aurora_door_top",
"y": 180
},
"facing=west,half=upper,hinge=left,open=true": {
"model": "otemod:block/aurora_door_top_hinge",
"y": 270
},
"facing=west,half=upper,hinge=right,open=false": {
"model": "otemod:block/aurora_door_top_hinge",
"y": 180
},
"facing=west,half=upper,hinge=right,open=true": {
"model": "otemod:block/aurora_door_top",
"y": 90
}
}
}

View file

@ -1,43 +0,0 @@
{
"multipart": [
{
"apply": { "model": "otemod:block/gold_bars/post_ends" }
},
{
"when": { "north": "false", "west": "false", "south": "false", "east": "false" },
"apply": { "model": "otemod:block/gold_bars/post" }
},
{
"when": { "north": "true", "west": "false", "south": "false", "east": "false" },
"apply": { "model": "otemod:block/gold_bars/cap" }
},
{
"when": { "north": "false", "west": "false", "south": "false", "east": "true" },
"apply": { "model": "otemod:block/gold_bars/cap", "y": 90 }
},
{
"when": { "north": "false", "west": "false", "south": "true", "east": "false" },
"apply": { "model": "otemod:block/gold_bars/cap_alt" }
},
{
"when": { "north": "false", "west": "true", "south": "false", "east": "false" },
"apply": { "model": "otemod:block/gold_bars/cap_alt", "y": 90 }
},
{
"when": { "north": "true" },
"apply": { "model": "otemod:block/gold_bars/side" }
},
{
"when": { "east": "true" },
"apply": { "model": "otemod:block/gold_bars/side", "y": 90 }
},
{
"when": { "south": "true" },
"apply": { "model": "otemod:block/gold_bars/side_alt" }
},
{
"when": { "west": "true" },
"apply": { "model": "otemod:block/gold_bars/side_alt", "y": 90 }
}
]
}

View file

@ -1,7 +0,0 @@
{
"variants": {
"": {
"model": "otemod:block/nether_grout"
}
}
}

View file

@ -1,8 +0,0 @@
{
"variants": {
"facing=north": { "model": "otemod:block/scorched_table" },
"facing=south": { "model": "otemod:block/scorched_table", "y": 180 },
"facing=west": { "model": "otemod:block/scorched_table", "y": 270 },
"facing=east": { "model": "otemod:block/scorched_table", "y": 90 }
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "otemod:block/vault_steel_ore_block"
}
}
}

View file

@ -3,10 +3,6 @@
"key.category.otemod": "Only The Essentials",
"itemGroup.refinedfabric.materials": "RefinedFabric Materials",
"itemGroup.refinedfabric.tools": "RefinedFabric Utilities",
"itemGroup.refinedfabric.blocks": "RefinedFabric Blocks",
"item.otemod.eternium_ore": "Raw Eternium Ore",
"item.otemod.ihan_crystal": "Ihan Crystal",
"item.otemod.ihan_crystal.levels": "Stored XP: ",
@ -19,9 +15,6 @@
"item.otemod.raw_cobalt": "Raw Cobalt",
"item.otemod.cobalt_nugget": "Cobalt Nugget",
"item.otemod.cobalt_ingot": "Cobalt Ingot",
"item.otemod.pattern": "Pattern",
"item.otemod.scorched_brick": "Scorched Brick",
"item.otemod.copper_can": "Copper Can",
"item.otemod.melted_nether_star": "Melted Nether Star",
"item.otemod.eternium_ingot": "Eternium Ingot",
"item.otemod.eternium_rod": "Eternium Rod",
@ -29,6 +22,18 @@
"item.otemod.scrubber_frame_piece": "Scrubber Frame Component",
"item.otemod.scrubber_frame": "Scrubber Frame",
"item.otemod.possum_spawn_egg": "Possum Spawn Egg",
"item.otemod.vault": "Vault",
"item.otemod.vault_steel_ingot": "Vault Steel Ingot",
"item.otemod.vault_fragment_lower_left": "Vault Fragment",
"item.otemod.vault_fragment_lower_right": "Vault Fragment",
"item.otemod.vault_fragment_upper": "Vault Fragment",
"item.otemod.vault_fragment_upper_left": "Vault Fragment",
"item.otemod.vault_fragment_upper_right": "Vault Fragment",
"item.otemod.vault_fragment_lower": "Vault Fragment",
"item.otemod.vault_fragment_left": "Vault Fragment",
"item.otemod.vault_fragment_right": "Vault Fragment",
"item.otemod.vault_fragment_center": "Vault Fragment",
"item.otemod.raw_vault_steel_ore": "Raw Vault Steel",
"block.otemod.eternium_ore_block": "Eternium Ore",
@ -38,13 +43,11 @@
"block.otemod.clear_glass_block": "Clear Glass Block",
"block.otemod.cobalt_ore": "Cobalt Ore",
"block.otemod.raw_cobalt_ore": "Raw Cobalt Ore",
"block.otemod.gold_bars": "Gold Bars",
"block.otemod.cobalt_block": "Cobalt",
"block.otemod.nether_grout": "Nether Grout",
"block.otemod.scorched_table": "Scorched Table",
"block.otemod.item_scrubber": "Item Scrubber",
"block.otemod.magical_scrubber": "Magical Scrubber",
"block.otemod.stable_singularity": "Stable Singularity",
"block.otemod.vault_steel_ore_block": "Vault Steel Ore",
"enchantment.otemod.mob_egging": "Mob Egging",

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/door_bottom",
"render_type": "minecraft:translucent",
"textures": {
"top": "minecraft:block/aurora_door_top",
"bottom": "minecraft:block/aurora_door_bottom"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/door_bottom_rh",
"render_type": "minecraft:translucent",
"textures": {
"top": "minecraft:block/aurora_door_top",
"bottom": "minecraft:block/aurora_door_bottom"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_bottom_left_open",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_bottom_right_open",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/door_top",
"render_type": "minecraft:translucent",
"textures": {
"top": "minecraft:block/aurora_door_top",
"bottom": "minecraft:block/aurora_door_bottom"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/door_top_rh",
"render_type": "minecraft:translucent",
"textures": {
"top": "minecraft:block/aurora_door_top",
"bottom": "minecraft:block/aurora_door_bottom"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_top_left",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_top_left_open",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_top_right",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "minecraft:block/door_top_right_open",
"render_type": "minecraft:translucent",
"textures": {
"bottom": "otemod:block/aurora_door_bottom",
"top": "otemod:block/aurora_door_top"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "block/iron_bars_cap",
"render_type": "minecraft:translucent",
"textures": {
"particle": "otemod:block/gold_bars",
"bars": "otemod:block/gold_bars",
"edge": "otemod:block/gold_bars"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "block/iron_bars_cap_alt",
"render_type": "minecraft:translucent",
"textures": {
"particle": "otemod:block/gold_bars",
"bars": "otemod:block/gold_bars",
"edge": "otemod:block/gold_bars"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "block/iron_bars_post",
"render_type": "minecraft:translucent",
"textures": {
"particle": "otemod:block/gold_bars",
"bars": "otemod:block/gold_bars"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "block/iron_bars_post_ends",
"render_type": "minecraft:translucent",
"textures": {
"particle": "otemod:block/gold_bars",
"edge": "otemod:block/gold_bars"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "block/iron_bars_side",
"render_type": "minecraft:translucent",
"textures": {
"particle": "otemod:block/gold_bars",
"bars": "otemod:block/gold_bars",
"edge": "otemod:block/gold_bars"
}
}

View file

@ -1,9 +0,0 @@
{
"parent": "block/iron_bars_side_alt",
"render_type": "minecraft:translucent",
"textures": {
"particle": "otemod:block/gold_bars",
"bars": "otemod:block/gold_bars",
"edge": "otemod:block/gold_bars"
}
}

View file

@ -1,8 +0,0 @@
{
"parent": "otemod:block/template/table",
"textures": {
"side": "otemod:block/scorched_table/table_side",
"top": "otemod:block/scorched_table/table_top",
"bottom": "otemod:block/scorched_table/table_bottom"
}
}

View file

@ -1,114 +0,0 @@
{
"loader": "otemod:casting",
"parent": "block/block",
"textures": {
"particle": "#side"
},
"elements": [
{
"name": "Table outer",
"from": [ 0, 10, 0 ],
"to": [ 16, 16, 16 ],
"faces": {
"north": { "texture": "#side", "cullface": "north" },
"east": { "texture": "#side", "cullface": "east" },
"south": { "texture": "#side", "cullface": "south" },
"west": { "texture": "#side", "cullface": "west" },
"down": { "texture": "#bottom" }
}
},
{
"name": "Table inner",
"from": [ 15, 16, 15 ],
"to": [ 1, 15, 1 ],
"faces": {
"north": { "texture": "#side", "cullface": "up" },
"east": { "texture": "#side", "cullface": "up" },
"south": { "texture": "#side", "cullface": "up" },
"west": { "texture": "#side", "cullface": "up" },
"up": { "texture": "#top", "cullface": "up" }
}
},
{
"name": "Northwest leg",
"from": [ 0, 0, 0] ,
"to": [ 4, 10, 4 ],
"faces": {
"north": { "texture": "#side", "cullface": "north" },
"east": { "texture": "#side" },
"south": { "texture": "#side" },
"west": { "texture": "#side", "cullface": "west" },
"down": { "texture": "#bottom", "cullface": "down" }
}
},
{
"name": "Northeast leg",
"from": [ 12, 0, 0 ],
"to": [ 16, 10, 4 ],
"faces": {
"north": { "texture": "#side", "cullface": "north" },
"east": { "texture": "#side", "cullface": "east" },
"south": { "texture": "#side"},
"west": { "texture": "#side"},
"down": { "texture": "#bottom", "cullface": "down" }
}
},
{
"name": "Southeast leg",
"from": [ 12, 0, 12 ],
"to": [ 16, 10, 16 ],
"faces": {
"north": { "texture": "#side" },
"east": { "texture": "#side", "cullface": "east" },
"south": { "texture": "#side", "cullface": "south" },
"west": { "texture": "#side" },
"down": { "texture": "#bottom", "cullface": "down" }
}
},
{
"name": "Southwest leg",
"from": [ 0, 0, 12 ],
"to": [ 4, 10, 16 ],
"faces": {
"north": { "texture": "#side" },
"east": { "texture": "#side" },
"south": { "texture": "#side", "cullface": "south" },
"west": { "texture": "#side", "cullface": "west" },
"down": { "texture": "#bottom", "cullface": "down" }
}
},
{
"name": "West top edge",
"from": [ 0, 16, 0 ],
"to": [ 1, 16, 16 ],
"faces": { "up": { "texture": "#top", "cullface": "up" }}
},
{
"name": "East top edge",
"from": [ 15, 16, 0 ],
"to": [ 16, 16, 16 ],
"faces": { "up": { "texture": "#top", "cullface": "up" }}
},
{
"name": "North top edge",
"from": [ 1, 16, 0 ],
"to": [ 15, 16, 1 ],
"faces": { "up": { "texture": "#top", "cullface": "up" }}
},
{
"name": "South top edge",
"from": [ 1, 16, 15 ],
"to": [ 15, 16, 16 ],
"faces": { "up": { "texture": "#top", "cullface": "up" }}
}
],
"fluid": {
"from": [ 1, 15, 1 ],
"to": [ 15, 15.9, 15 ],
"faces": { "up": {} }
},
"items": [
{ "center": [ 8, 15.5, 8 ], "size": 14, "x": 270, "y": 180, "transform": "fixed" },
{ "center": [ 8, 15.5, 8 ], "size": 14.1, "x": 270, "y": 180, "transform": "fixed" }
]
}

View file

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

View file

@ -1,3 +0,0 @@
{
"parent": "otemod:block/nether_grout"
}

View file

@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "otemod:block/gold_bars"
"layer0": "otemod:item/raw_vault_steel_ore"
}
}
}

View file

@ -1,3 +0,0 @@
{
"parent": "otemod:block/scorched_table"
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -0,0 +1,3 @@
{
"parent": "otemod:block/vault_steel_ore_block"
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 304 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 741 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 853 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

View file

@ -1,6 +1,7 @@
{
"values": [
"#forge:ores/cobalt",
"#forge:ores/eternium"
"#forge:ores/eternium",
"#forge:ores/vaultsteel"
]
}

View file

@ -0,0 +1,5 @@
{
"values": [
"otemod:vault_steel_ore_block"
]
}

View file

@ -1,6 +1,7 @@
{
"values": [
"#forge:ingots/cobalt",
"#forge:ingots/eternium"
"#forge:ingots/eternium",
"#forge:ingots/vaultsteel"
]
}

View file

@ -0,0 +1,5 @@
{
"values":[
"otemod:vault_steel_ingot"
]
}

View file

@ -1,6 +1,7 @@
{
"values": [
"#forge:ores/cobalt",
"#forge:ores/eternium"
"#forge:ores/eternium",
"#forge:ores/vaultsteel"
]
}

View file

@ -0,0 +1,5 @@
{
"values": [
"otemod:raw_vault_steel_ore"
]
}

View file

@ -0,0 +1,3 @@
{
"item.minecraft.baked_potato": "Emergency Baked Potato"
}

View file

@ -8,6 +8,9 @@
"otemod:cobalt_ore",
"otemod:raw_cobalt_ore",
"otemod:item_scrubber"
"otemod:item_scrubber",
"otemod:magical_scrubber",
"otemod:vault_steel_ore_block"
]
}

View file

@ -1,6 +1,9 @@
{
"values": [
"otemod:aurora_block",
"otemod:aurora_door"
"otemod:aurora_door",
"otemod:item_scrubber",
"otemod:magical_scrubber",
"otemod:vault_steel_ore_block"
]
}

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
{
"type": "otemod:resource_nether",
"type": "minecraft:the_nether",
"generator": {
"type": "minecraft:noise",
"settings": "otemod:resource_nether",
"disable_mob_generation": true,
"seed": 0,
"settings": "minecraft:nether",
"biome_source": {
"type": "minecraft:multi_noise",
"biomes": [
@ -66,18 +66,6 @@
"depth": 0,
"offset": 0.175
}
},
{
"biome": "minecraft:mushroom_fields",
"parameters": {
"temperature": [-1, 1],
"humidity": [-1, 1],
"continentalness": [-1.2, -1.05],
"erosion": [-1, 1],
"weirdness": [-1, 1],
"depth": 0,
"offset": 0
}
}
]
}

View file

@ -1,13 +0,0 @@
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:grass_block
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:dirt
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:stone
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:bedrock
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:gravel
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:andesite
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:diorite
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:granite
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:tuff
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:water
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:lava
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace otemod:aurora_block

View file

@ -0,0 +1,6 @@
{
"type": "forge:add_features",
"features": ["otemod:vaultsteel_oregen_overworld"],
"biomes": "#is_overworld",
"step": "underground_ores"
}

View file

@ -0,0 +1,31 @@
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:grass_block
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:dirt
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:stone
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:bedrock
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:gravel
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:andesite
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:diorite
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:granite
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:tuff
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:water
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:lava
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace otemod:aurora_block
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_diamond_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:diamond_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_iron_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:iron_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_gold_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:gold_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_redstone_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:redstone_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_lapis_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:lapis_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:deepslate_copper_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:copper_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace minecraft:dripstone_block
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_lead_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_fluorite_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_uranium_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_osmium_ore
fill ~-10 ~-32 ~-10 ~10 ~15 ~10 minecraft:air replace mekanism:deepslate_tin_ore

Some files were not shown because too many files have changed in this diff Show more