Update to 1.19
This commit is contained in:
parent
1e9da88ba4
commit
f5e8de74d7
53 changed files with 970 additions and 3408 deletions
|
@ -3,22 +3,22 @@
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx3G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
libzontreck=1.10.012124.1709
|
libzontreck=1.10.013124.1729
|
||||||
|
|
||||||
## Environment Properties
|
## Environment Properties
|
||||||
|
|
||||||
# The Minecraft version must agree with the Forge version to get a valid artifact
|
# The Minecraft version must agree with the Forge version to get a valid artifact
|
||||||
minecraft_version=1.18.2
|
minecraft_version=1.19.2
|
||||||
# The Minecraft version range can use any release version of Minecraft as bounds.
|
# The Minecraft version range can use any release version of Minecraft as bounds.
|
||||||
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
|
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
|
||||||
# as they do not follow standard versioning conventions.
|
# as they do not follow standard versioning conventions.
|
||||||
minecraft_version_range=[1.18.2,1.19)
|
minecraft_version_range=[1.19,1.20)
|
||||||
# The Forge version must agree with the Minecraft version to get a valid artifact
|
# The Forge version must agree with the Minecraft version to get a valid artifact
|
||||||
forge_version=40.2.1
|
forge_version=43.3.0
|
||||||
# The Forge version range can use any version of Forge as bounds or match the loader version range
|
# The Forge version range can use any version of Forge as bounds or match the loader version range
|
||||||
forge_version_range=[40,)
|
forge_version_range=[43,)
|
||||||
# The loader version range can only use the major version of Forge/FML as bounds
|
# The loader version range can only use the major version of Forge/FML as bounds
|
||||||
loader_version_range=[40,)
|
loader_version_range=[43,)
|
||||||
# The mapping channel to use for mappings.
|
# The mapping channel to use for mappings.
|
||||||
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
|
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
|
||||||
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
|
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
|
||||||
|
@ -36,7 +36,7 @@ loader_version_range=[40,)
|
||||||
mapping_channel=parchment
|
mapping_channel=parchment
|
||||||
# The mapping version to query from the mapping channel.
|
# The mapping version to query from the mapping channel.
|
||||||
# This must match the format required by the mapping channel.
|
# This must match the format required by the mapping channel.
|
||||||
mapping_version=2022.11.06-1.18.2
|
mapping_version=2022.11.27-1.19.2
|
||||||
|
|
||||||
|
|
||||||
## Mod Properties
|
## Mod Properties
|
||||||
|
@ -49,7 +49,7 @@ mod_name=Thresholds
|
||||||
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||||
mod_license=GPLv3
|
mod_license=GPLv3
|
||||||
# The mod version. See https://semver.org/
|
# The mod version. See https://semver.org/
|
||||||
mod_version=1.4.013024.2101
|
mod_version=1.4.020124.1526
|
||||||
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
||||||
# This should match the base package used for the mod sources.
|
# This should match the base package used for the mod sources.
|
||||||
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
1
gradle/wrapper/gradle-wrapper.properties
vendored
1
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
|
||||||
networkTimeout=10000
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
12
gradlew
vendored
12
gradlew
vendored
|
@ -55,7 +55,7 @@
|
||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
@ -80,11 +80,11 @@ do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
# This is normally unused
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
@ -143,16 +143,12 @@ fi
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC3045
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC3045
|
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
|
|
1
gradlew.bat
vendored
1
gradlew.bat
vendored
|
@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
@rem This is normally unused
|
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"uuid": "380df991-f603-344c-a090-369bad2a924a",
|
|
||||||
"name": "Dev",
|
|
||||||
"level": 4,
|
|
||||||
"bypassesPlayerLimit": false
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,6 +1,5 @@
|
||||||
version:3465
|
version:3120
|
||||||
autoJump:false
|
autoJump:true
|
||||||
operatorItemsTab:false
|
|
||||||
autoSuggestions:true
|
autoSuggestions:true
|
||||||
chatColors:true
|
chatColors:true
|
||||||
chatLinks:true
|
chatLinks:true
|
||||||
|
@ -12,7 +11,7 @@ discrete_mouse_scroll:false
|
||||||
invertYMouse:false
|
invertYMouse:false
|
||||||
realmsNotifications:true
|
realmsNotifications:true
|
||||||
reducedDebugInfo:false
|
reducedDebugInfo:false
|
||||||
showSubtitles:true
|
showSubtitles:false
|
||||||
directionalAudio:false
|
directionalAudio:false
|
||||||
touchscreen:false
|
touchscreen:false
|
||||||
fullscreen:false
|
fullscreen:false
|
||||||
|
@ -26,25 +25,21 @@ fov:0.0
|
||||||
screenEffectScale:1.0
|
screenEffectScale:1.0
|
||||||
fovEffectScale:1.0
|
fovEffectScale:1.0
|
||||||
darknessEffectScale:1.0
|
darknessEffectScale:1.0
|
||||||
glintSpeed:0.5
|
gamma:0.5
|
||||||
glintStrength:0.75
|
|
||||||
damageTiltStrength:1.0
|
|
||||||
highContrast:false
|
|
||||||
gamma:1.0
|
|
||||||
renderDistance:12
|
renderDistance:12
|
||||||
simulationDistance:12
|
simulationDistance:12
|
||||||
entityDistanceScaling:1.0
|
entityDistanceScaling:1.0
|
||||||
guiScale:2
|
guiScale:0
|
||||||
particles:0
|
particles:0
|
||||||
maxFps:120
|
maxFps:120
|
||||||
graphicsMode:1
|
graphicsMode:1
|
||||||
ao:true
|
ao:2
|
||||||
prioritizeChunkUpdates:0
|
prioritizeChunkUpdates:0
|
||||||
biomeBlendRadius:2
|
biomeBlendRadius:2
|
||||||
renderClouds:"false"
|
renderClouds:"true"
|
||||||
resourcePacks:[]
|
resourcePacks:[]
|
||||||
incompatibleResourcePacks:[]
|
incompatibleResourcePacks:[]
|
||||||
lastServer:127.0.0.1
|
lastServer:
|
||||||
lang:en_us
|
lang:en_us
|
||||||
soundDevice:""
|
soundDevice:""
|
||||||
chatVisibility:0
|
chatVisibility:0
|
||||||
|
@ -53,16 +48,16 @@ chatLineSpacing:0.0
|
||||||
textBackgroundOpacity:0.5
|
textBackgroundOpacity:0.5
|
||||||
backgroundForChatOnly:true
|
backgroundForChatOnly:true
|
||||||
hideServerAddress:false
|
hideServerAddress:false
|
||||||
advancedItemTooltips:true
|
advancedItemTooltips:false
|
||||||
pauseOnLostFocus:true
|
pauseOnLostFocus:true
|
||||||
overrideWidth:0
|
overrideWidth:0
|
||||||
overrideHeight:0
|
overrideHeight:0
|
||||||
|
heldItemTooltips:true
|
||||||
chatHeightFocused:1.0
|
chatHeightFocused:1.0
|
||||||
chatDelay:0.0
|
chatDelay:0.0
|
||||||
chatHeightUnfocused:0.4375
|
chatHeightUnfocused:0.4375
|
||||||
chatScale:1.0
|
chatScale:1.0
|
||||||
chatWidth:1.0
|
chatWidth:1.0
|
||||||
notificationDisplayTime:1.0
|
|
||||||
mipmapLevels:4
|
mipmapLevels:4
|
||||||
useNativeTransport:true
|
useNativeTransport:true
|
||||||
mainHand:"right"
|
mainHand:"right"
|
||||||
|
@ -72,18 +67,16 @@ tutorialStep:none
|
||||||
mouseWheelSensitivity:1.0
|
mouseWheelSensitivity:1.0
|
||||||
rawMouseInput:true
|
rawMouseInput:true
|
||||||
glDebugVerbosity:1
|
glDebugVerbosity:1
|
||||||
skipMultiplayerWarning:true
|
skipMultiplayerWarning:false
|
||||||
skipRealms32bitWarning:false
|
skipRealms32bitWarning:false
|
||||||
hideMatchedNames:true
|
hideMatchedNames:true
|
||||||
joinedFirstServer:true
|
joinedFirstServer:false
|
||||||
hideBundleTutorial:false
|
hideBundleTutorial:false
|
||||||
syncChunkWrites:true
|
syncChunkWrites:false
|
||||||
showAutosaveIndicator:true
|
showAutosaveIndicator:true
|
||||||
allowServerListing:true
|
allowServerListing:true
|
||||||
|
chatPreview:1
|
||||||
onlyShowSecureChat:false
|
onlyShowSecureChat:false
|
||||||
panoramaScrollSpeed:1.0
|
|
||||||
telemetryOptInExtra:false
|
|
||||||
onboardAccessibility:false
|
|
||||||
key_key.attack:key.mouse.left
|
key_key.attack:key.mouse.left
|
||||||
key_key.use:key.mouse.right
|
key_key.use:key.mouse.right
|
||||||
key_key.forward:key.keyboard.w
|
key_key.forward:key.keyboard.w
|
||||||
|
@ -118,19 +111,8 @@ key_key.hotbar.6:key.keyboard.6
|
||||||
key_key.hotbar.7:key.keyboard.7
|
key_key.hotbar.7:key.keyboard.7
|
||||||
key_key.hotbar.8:key.keyboard.8
|
key_key.hotbar.8:key.keyboard.8
|
||||||
key_key.hotbar.9:key.keyboard.9
|
key_key.hotbar.9:key.keyboard.9
|
||||||
key_key.mekanism.mode:key.keyboard.n
|
|
||||||
key_key.mekanism.head_mode:key.keyboard.v
|
|
||||||
key_key.mekanism.chest_mode:key.keyboard.g
|
|
||||||
key_key.mekanism.legs_mode:key.keyboard.j
|
|
||||||
key_key.mekanism.feet_mode:key.keyboard.b
|
|
||||||
key_key.mekanism.details:key.keyboard.left.shift
|
|
||||||
key_key.mekanism.description:key.keyboard.n:SHIFT
|
|
||||||
key_key.mekanism.module_tweaker:key.keyboard.backslash
|
|
||||||
key_key.mekanism.key_boost:key.keyboard.left.control
|
|
||||||
key_key.mekanism.key_hud:key.keyboard.h
|
|
||||||
key_key.otemod.open_vault:key.keyboard.left.alt
|
|
||||||
soundCategory_master:1.0
|
soundCategory_master:1.0
|
||||||
soundCategory_music:0.08862526
|
soundCategory_music:1.0
|
||||||
soundCategory_record:1.0
|
soundCategory_record:1.0
|
||||||
soundCategory_weather:1.0
|
soundCategory_weather:1.0
|
||||||
soundCategory_block:1.0
|
soundCategory_block:1.0
|
||||||
|
|
|
@ -1,57 +0,0 @@
|
||||||
#Minecraft server properties
|
|
||||||
#Mon Feb 27 02:56:23 MST 2023
|
|
||||||
allow-flight=false
|
|
||||||
allow-nether=true
|
|
||||||
broadcast-console-to-ops=true
|
|
||||||
broadcast-rcon-to-ops=true
|
|
||||||
difficulty=easy
|
|
||||||
enable-command-block=false
|
|
||||||
enable-jmx-monitoring=false
|
|
||||||
enable-query=false
|
|
||||||
enable-rcon=false
|
|
||||||
enable-status=true
|
|
||||||
enforce-secure-profile=true
|
|
||||||
enforce-whitelist=false
|
|
||||||
entity-broadcast-range-percentage=100
|
|
||||||
force-gamemode=false
|
|
||||||
function-permission-level=2
|
|
||||||
gamemode=survival
|
|
||||||
generate-structures=true
|
|
||||||
generator-settings={}
|
|
||||||
hardcore=false
|
|
||||||
hide-online-players=false
|
|
||||||
level-name=world
|
|
||||||
level-seed=
|
|
||||||
level-type=minecraft\:normal
|
|
||||||
max-chained-neighbor-updates=1000000
|
|
||||||
max-players=20
|
|
||||||
max-tick-time=60000
|
|
||||||
max-world-size=29999984
|
|
||||||
motd=A Minecraft Server
|
|
||||||
network-compression-threshold=256
|
|
||||||
online-mode=false
|
|
||||||
op-permission-level=4
|
|
||||||
player-idle-timeout=0
|
|
||||||
prevent-proxy-connections=false
|
|
||||||
previews-chat=false
|
|
||||||
pvp=true
|
|
||||||
query.port=25565
|
|
||||||
rate-limit=0
|
|
||||||
rcon.password=
|
|
||||||
rcon.port=25575
|
|
||||||
require-resource-pack=false
|
|
||||||
resource-pack=
|
|
||||||
resource-pack-prompt=
|
|
||||||
resource-pack-sha1=
|
|
||||||
server-ip=
|
|
||||||
server-port=25565
|
|
||||||
simulation-distance=10
|
|
||||||
spawn-animals=true
|
|
||||||
spawn-monsters=true
|
|
||||||
spawn-npcs=true
|
|
||||||
spawn-protection=16
|
|
||||||
sync-chunk-writes=true
|
|
||||||
text-filtering-config=
|
|
||||||
use-native-transport=true
|
|
||||||
view-distance=10
|
|
||||||
white-list=false
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"item.minecraft.baked_potato": "Emergency Baked Potato"
|
|
||||||
}
|
|
|
@ -1,8 +0,0 @@
|
||||||
{
|
|
||||||
"pack": {
|
|
||||||
"description": {
|
|
||||||
"text": "OTEMod Server Resource Pack"
|
|
||||||
},
|
|
||||||
"pack_format": 15
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -18,7 +18,6 @@ import dev.zontreck.otemod.implementation.PlayerFirstJoinTag;
|
||||||
import dev.zontreck.otemod.implementation.compressor.CompressionChamberScreen;
|
import dev.zontreck.otemod.implementation.compressor.CompressionChamberScreen;
|
||||||
import dev.zontreck.otemod.implementation.vault.*;
|
import dev.zontreck.otemod.implementation.vault.*;
|
||||||
import dev.zontreck.otemod.integrations.KeyBindings;
|
import dev.zontreck.otemod.integrations.KeyBindings;
|
||||||
import dev.zontreck.otemod.ore.OreGenerator;
|
|
||||||
import dev.zontreck.otemod.recipe.ModRecipes;
|
import dev.zontreck.otemod.recipe.ModRecipes;
|
||||||
import net.minecraft.client.gui.screens.MenuScreens;
|
import net.minecraft.client.gui.screens.MenuScreens;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
@ -69,8 +68,6 @@ public class OTEMod
|
||||||
// Directly reference a slf4j logger
|
// Directly reference a slf4j logger
|
||||||
public static final Logger LOGGER = LogUtils.getLogger();
|
public static final Logger LOGGER = LogUtils.getLogger();
|
||||||
public static final String MOD_ID = "otemod";
|
public static final String MOD_ID = "otemod";
|
||||||
public static final String MODIFY_BIOMES = "modify_biomes";
|
|
||||||
public static final ResourceLocation MODIFY_BIOMES_RL = new ResourceLocation(OTEMod.MOD_ID, MODIFY_BIOMES);
|
|
||||||
|
|
||||||
//public static List<TeleportContainer> TeleportRegistry = new ArrayList<>();
|
//public static List<TeleportContainer> TeleportRegistry = new ArrayList<>();
|
||||||
public static MinecraftServer THE_SERVER;
|
public static MinecraftServer THE_SERVER;
|
||||||
|
@ -106,7 +103,6 @@ public class OTEMod
|
||||||
MinecraftForge.EVENT_BUS.register(new CommandRegistry());
|
MinecraftForge.EVENT_BUS.register(new CommandRegistry());
|
||||||
MinecraftForge.EVENT_BUS.register(new VaultWatcher());
|
MinecraftForge.EVENT_BUS.register(new VaultWatcher());
|
||||||
MinecraftForge.EVENT_BUS.register(new dev.zontreck.otemod.zschem.EventHandler());
|
MinecraftForge.EVENT_BUS.register(new dev.zontreck.otemod.zschem.EventHandler());
|
||||||
MinecraftForge.EVENT_BUS.register(OreGenerator.class);
|
|
||||||
MinecraftForge.EVENT_BUS.register(FlightEnchantment.class);
|
MinecraftForge.EVENT_BUS.register(FlightEnchantment.class);
|
||||||
MinecraftForge.EVENT_BUS.register(NightVisionEnchantment.class);
|
MinecraftForge.EVENT_BUS.register(NightVisionEnchantment.class);
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class CompressionChamberBlock extends HorizontalDirectionalBlock implemen
|
||||||
if(be instanceof CompressionChamberBlockEntity)
|
if(be instanceof CompressionChamberBlockEntity)
|
||||||
{
|
{
|
||||||
CompressionChamberBlockEntity entity = (CompressionChamberBlockEntity) be;
|
CompressionChamberBlockEntity entity = (CompressionChamberBlockEntity) be;
|
||||||
NetworkHooks.openGui(((ServerPlayer)player), entity, pos);
|
NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
|
||||||
|
|
||||||
ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
|
ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ public class ItemScrubberBlock extends HorizontalDirectionalBlock implements Ent
|
||||||
if(be instanceof ItemScrubberBlockEntity)
|
if(be instanceof ItemScrubberBlockEntity)
|
||||||
{
|
{
|
||||||
ItemScrubberBlockEntity entity = (ItemScrubberBlockEntity)be;
|
ItemScrubberBlockEntity entity = (ItemScrubberBlockEntity)be;
|
||||||
NetworkHooks.openGui(((ServerPlayer)player), entity, pos);
|
NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
|
||||||
|
|
||||||
ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
|
ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ public class MagicalScrubberBlock extends HorizontalDirectionalBlock implements
|
||||||
if(be instanceof MagicalScrubberBlockEntity)
|
if(be instanceof MagicalScrubberBlockEntity)
|
||||||
{
|
{
|
||||||
MagicalScrubberBlockEntity entity = (MagicalScrubberBlockEntity)be;
|
MagicalScrubberBlockEntity entity = (MagicalScrubberBlockEntity)be;
|
||||||
NetworkHooks.openGui(((ServerPlayer)player), entity, pos);
|
NetworkHooks.openScreen(((ServerPlayer)player), entity, pos);
|
||||||
|
|
||||||
ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
|
ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player);
|
||||||
}else{
|
}else{
|
||||||
|
|
|
@ -9,7 +9,6 @@ import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.core.Direction;
|
import net.minecraft.core.Direction;
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
|
||||||
import net.minecraft.world.Containers;
|
import net.minecraft.world.Containers;
|
||||||
import net.minecraft.world.MenuProvider;
|
import net.minecraft.world.MenuProvider;
|
||||||
import net.minecraft.world.SimpleContainer;
|
import net.minecraft.world.SimpleContainer;
|
||||||
|
@ -23,10 +22,9 @@ import net.minecraft.world.level.Level;
|
||||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraftforge.common.capabilities.Capability;
|
import net.minecraftforge.common.capabilities.Capability;
|
||||||
|
import net.minecraftforge.common.capabilities.ForgeCapabilities;
|
||||||
import net.minecraftforge.common.util.LazyOptional;
|
import net.minecraftforge.common.util.LazyOptional;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.energy.IEnergyStorage;
|
import net.minecraftforge.energy.IEnergyStorage;
|
||||||
import net.minecraftforge.items.CapabilityItemHandler;
|
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
import net.minecraftforge.items.ItemStackHandler;
|
import net.minecraftforge.items.ItemStackHandler;
|
||||||
|
|
||||||
|
@ -113,22 +111,22 @@ public class ItemScrubberBlockEntity extends BlockEntity implements MenuProvider
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Component getDisplayName() {
|
public Component getDisplayName() {
|
||||||
return new TranslatableComponent("block.otemod.item_scrubber");
|
return Component.translatable("block.otemod.item_scrubber");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> LazyOptional<T> getCapability(Capability<T> cap, Direction side)
|
public <T> LazyOptional<T> getCapability(Capability<T> cap, Direction side)
|
||||||
{
|
{
|
||||||
if(cap == CapabilityEnergy.ENERGY)
|
if(cap == ForgeCapabilities.ENERGY)
|
||||||
{
|
{
|
||||||
return lazyEnergyHandler.cast();
|
return lazyEnergyHandler.cast();
|
||||||
}
|
}
|
||||||
if(side == Direction.DOWN && cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
|
if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
|
||||||
{
|
{
|
||||||
// Return the output slot only
|
// Return the output slot only
|
||||||
return lazyOutputItems.cast();
|
return lazyOutputItems.cast();
|
||||||
}
|
}
|
||||||
if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
|
if(cap == ForgeCapabilities.ITEM_HANDLER)
|
||||||
{
|
{
|
||||||
return lazyItemHandler.cast();
|
return lazyItemHandler.cast();
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@ import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.core.Direction;
|
import net.minecraft.core.Direction;
|
||||||
import net.minecraft.nbt.CompoundTag;
|
import net.minecraft.nbt.CompoundTag;
|
||||||
import net.minecraft.network.chat.Component;
|
import net.minecraft.network.chat.Component;
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
|
||||||
import net.minecraft.world.Containers;
|
import net.minecraft.world.Containers;
|
||||||
import net.minecraft.world.MenuProvider;
|
import net.minecraft.world.MenuProvider;
|
||||||
import net.minecraft.world.SimpleContainer;
|
import net.minecraft.world.SimpleContainer;
|
||||||
|
@ -27,10 +26,9 @@ import net.minecraft.world.level.Level;
|
||||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraftforge.common.capabilities.Capability;
|
import net.minecraftforge.common.capabilities.Capability;
|
||||||
|
import net.minecraftforge.common.capabilities.ForgeCapabilities;
|
||||||
import net.minecraftforge.common.util.LazyOptional;
|
import net.minecraftforge.common.util.LazyOptional;
|
||||||
import net.minecraftforge.energy.CapabilityEnergy;
|
|
||||||
import net.minecraftforge.energy.IEnergyStorage;
|
import net.minecraftforge.energy.IEnergyStorage;
|
||||||
import net.minecraftforge.items.CapabilityItemHandler;
|
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
import net.minecraftforge.items.ItemStackHandler;
|
import net.minecraftforge.items.ItemStackHandler;
|
||||||
|
|
||||||
|
@ -119,22 +117,22 @@ public class MagicalScrubberBlockEntity extends BlockEntity implements MenuProvi
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Component getDisplayName() {
|
public Component getDisplayName() {
|
||||||
return new TranslatableComponent("block.otemod.magical_scrubber");
|
return Component.translatable("block.otemod.magical_scrubber");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public <T> LazyOptional<T> getCapability(Capability<T> cap, Direction side)
|
public <T> LazyOptional<T> getCapability(Capability<T> cap, Direction side)
|
||||||
{
|
{
|
||||||
if(cap == CapabilityEnergy.ENERGY)
|
if(cap == ForgeCapabilities.ENERGY)
|
||||||
{
|
{
|
||||||
return lazyEnergyHandler.cast();
|
return lazyEnergyHandler.cast();
|
||||||
}
|
}
|
||||||
if(side == Direction.DOWN && cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
|
if(side == Direction.DOWN && cap == ForgeCapabilities.ITEM_HANDLER)
|
||||||
{
|
{
|
||||||
// Return the output slot only
|
// Return the output slot only
|
||||||
return lazyOutputItems.cast();
|
return lazyOutputItems.cast();
|
||||||
}
|
}
|
||||||
if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
|
if(cap == ForgeCapabilities.ITEM_HANDLER)
|
||||||
{
|
{
|
||||||
return lazyItemHandler.cast();
|
return lazyItemHandler.cast();
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@ import net.minecraftforge.registries.RegistryObject;
|
||||||
|
|
||||||
public class ModEntities {
|
public class ModEntities {
|
||||||
|
|
||||||
public static final DeferredRegister<BlockEntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, OTEMod.MOD_ID);
|
public static final DeferredRegister<BlockEntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, OTEMod.MOD_ID);
|
||||||
|
|
||||||
public static final RegistryObject <BlockEntityType <ItemScrubberBlockEntity>> ITEM_SCRUBBER = ENTITIES.register("item_scrubber", ()-> BlockEntityType.Builder.of(ItemScrubberBlockEntity::new, ModBlocks.ITEM_SCRUBBER.get()).build(null));
|
public static final RegistryObject <BlockEntityType <ItemScrubberBlockEntity>> ITEM_SCRUBBER = ENTITIES.register("item_scrubber", ()-> BlockEntityType.Builder.of(ItemScrubberBlockEntity::new, ModBlocks.ITEM_SCRUBBER.get()).build(null));
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ public class ChatServerOverride {
|
||||||
if(ev.getEntity().getLevel().isClientSide)return;
|
if(ev.getEntity().getLevel().isClientSide)return;
|
||||||
// Fix for fly ability not copying to new instance on death or other circumstances
|
// Fix for fly ability not copying to new instance on death or other circumstances
|
||||||
Player old = ev.getOriginal();
|
Player old = ev.getOriginal();
|
||||||
Player n = ev.getPlayer();
|
Player n = ev.getEntity();
|
||||||
|
|
||||||
PlayerFlyCache c = PlayerFlyCache.cachePlayer((ServerPlayer)old);
|
PlayerFlyCache c = PlayerFlyCache.cachePlayer((ServerPlayer)old);
|
||||||
c.Assert((ServerPlayer)n);
|
c.Assert((ServerPlayer)n);
|
||||||
|
@ -127,7 +127,7 @@ public class ChatServerOverride {
|
||||||
prefixStr = ChatColor.DARK_GRAY + "[" + ChatColor.BOLD + XD.prefix_color + XD.prefix + ChatColor.resetChat() + ChatColor.DARK_GRAY + "] ";
|
prefixStr = ChatColor.DARK_GRAY + "[" + ChatColor.BOLD + XD.prefix_color + XD.prefix + ChatColor.resetChat() + ChatColor.DARK_GRAY + "] ";
|
||||||
}
|
}
|
||||||
|
|
||||||
String msg = ev.getMessage();
|
String msg = ev.getRawText();
|
||||||
msg= ChatColor.doColors(msg);
|
msg= ChatColor.doColors(msg);
|
||||||
|
|
||||||
String nameStr = ChatColor.resetChat() + "< "+ XD.name_color + XD.nickname + ChatColor.resetChat() + " >";
|
String nameStr = ChatColor.resetChat() + "< "+ XD.name_color + XD.nickname + ChatColor.resetChat() + " >";
|
||||||
|
|
|
@ -68,7 +68,7 @@ public class StarterCommand
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
StarterContainer container = new StarterContainer(player);
|
StarterContainer container = new StarterContainer(player);
|
||||||
NetworkHooks.openGui(player, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Starter Gear")));
|
NetworkHooks.openScreen(player, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Starter Gear")));
|
||||||
|
|
||||||
|
|
||||||
// Add to the master vault registry
|
// Add to the master vault registry
|
||||||
|
@ -99,7 +99,7 @@ public class StarterCommand
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkHooks.openGui(p, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Starter Gear")));
|
NetworkHooks.openScreen(p, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Starter Gear")));
|
||||||
|
|
||||||
// Add to the master vault registry
|
// Add to the master vault registry
|
||||||
if(StarterContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());
|
if(StarterContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class TrashCommand {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkHooks.openGui(play, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Trash")));
|
NetworkHooks.openScreen(play, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Trash")));
|
||||||
|
|
||||||
// Add to the master vault registry
|
// Add to the master vault registry
|
||||||
if(VaultContainer.VAULT_REGISTRY.containsKey(play.getUUID()))VaultContainer.VAULT_REGISTRY.remove(play.getUUID());
|
if(VaultContainer.VAULT_REGISTRY.containsKey(play.getUUID()))VaultContainer.VAULT_REGISTRY.remove(play.getUUID());
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class VaultCommand {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkHooks.openGui(p, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Vault " + i)));
|
NetworkHooks.openScreen(p, new SimpleMenuProvider(container.serverMenu, ChatHelpers.macro("Vault " + i)));
|
||||||
|
|
||||||
// Add to the master vault registry
|
// Add to the master vault registry
|
||||||
if(VaultContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());
|
if(VaultContainer.VAULT_REGISTRY.containsKey(p.getUUID()))VaultContainer.VAULT_REGISTRY.remove(p.getUUID());
|
||||||
|
|
|
@ -147,13 +147,13 @@ public class ConsumptionMending extends Enchantment
|
||||||
if(id.isCurse() && ((dice >= 13) && (dice <= 18)))
|
if(id.isCurse() && ((dice >= 13) && (dice <= 18)))
|
||||||
{
|
{
|
||||||
stack.enchant(id, entry.getValue());
|
stack.enchant(id, entry.getValue());
|
||||||
player.getLevel().playSound(null, player.getOnPos(), SoundEvents.ANVIL_USE, SoundSource.NEUTRAL,1, player.getRandom().nextFloat(0,1));
|
player.getLevel().playSound(null, player.getOnPos(), SoundEvents.ANVIL_USE, SoundSource.NEUTRAL,1, player.getRandom().nextFloat());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
item.shrink(1);
|
item.shrink(1);
|
||||||
player.getLevel().playSound(null, player.getOnPos(), SoundEvents.PLAYER_BURP, SoundSource.NEUTRAL,1, player.getRandom().nextFloat(0,1));
|
player.getLevel().playSound(null, player.getOnPos(), SoundEvents.PLAYER_BURP, SoundSource.NEUTRAL,1, player.getRandom().nextFloat());
|
||||||
}
|
}
|
||||||
else item.setDamageValue(nDamage);
|
else item.setDamageValue(nDamage);
|
||||||
|
|
||||||
|
|
|
@ -23,13 +23,13 @@ public class EnchantmentEvents
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onTick(LivingEvent.LivingUpdateEvent tick)
|
public static void onTick(LivingEvent.LivingTickEvent tick)
|
||||||
{
|
{
|
||||||
if(canTick)
|
if(canTick)
|
||||||
{
|
{
|
||||||
// Process Enchantments
|
// Process Enchantments
|
||||||
|
|
||||||
if(tick.getEntityLiving() instanceof ServerPlayer sp)
|
if(tick.getEntity() instanceof ServerPlayer sp)
|
||||||
{
|
{
|
||||||
FlightEnchantment.runEntityTick(sp);
|
FlightEnchantment.runEntityTick(sp);
|
||||||
ConsumptionMending.onEntityTick(sp);
|
ConsumptionMending.onEntityTick(sp);
|
||||||
|
|
|
@ -20,7 +20,7 @@ public class ClientEvents {
|
||||||
static long lastPress;
|
static long lastPress;
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void onKeyInput(InputEvent.KeyInputEvent event)
|
public static void onKeyInput(InputEvent.Key event)
|
||||||
{
|
{
|
||||||
//OTEMod.LOGGER.info("KEY PRESS: "+event.getKey());
|
//OTEMod.LOGGER.info("KEY PRESS: "+event.getKey());
|
||||||
if(KeyBindings.OPEN_VAULT.matches(event.getKey(), event.getScanCode()) && Minecraft.getInstance().screen == null && lastPress+10 < Instant.now().getEpochSecond())
|
if(KeyBindings.OPEN_VAULT.matches(event.getKey(), event.getScanCode()) && Minecraft.getInstance().screen == null && lastPress+10 < Instant.now().getEpochSecond())
|
||||||
|
|
|
@ -109,7 +109,7 @@ public class EventHandler {
|
||||||
if(ent instanceof Player)
|
if(ent instanceof Player)
|
||||||
{
|
{
|
||||||
ServerPlayer play = (ServerPlayer)ent;
|
ServerPlayer play = (ServerPlayer)ent;
|
||||||
LivingEntity killed = ev.getEntityLiving();
|
LivingEntity killed = ev.getEntity();
|
||||||
|
|
||||||
ItemStack stack = play.getMainHandItem();
|
ItemStack stack = play.getMainHandItem();
|
||||||
int levelOfEgging = ItemUtils.getEnchantmentLevel(ModEnchantments.MOB_EGGING_ENCHANTMENT.get(),stack);
|
int levelOfEgging = ItemUtils.getEnchantmentLevel(ModEnchantments.MOB_EGGING_ENCHANTMENT.get(),stack);
|
||||||
|
|
|
@ -17,7 +17,7 @@ import net.minecraftforge.registries.RegistryObject;
|
||||||
|
|
||||||
public final class ModMenuTypes
|
public final class ModMenuTypes
|
||||||
{
|
{
|
||||||
public static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, OTEMod.MOD_ID);
|
public static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, OTEMod.MOD_ID);
|
||||||
|
|
||||||
public static final RegistryObject<MenuType<VaultMenu>> VAULT = registerMenuType(VaultMenu::new, "vault");
|
public static final RegistryObject<MenuType<VaultMenu>> VAULT = registerMenuType(VaultMenu::new, "vault");
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ import net.minecraft.world.level.block.Blocks;
|
||||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||||
import net.minecraftforge.event.world.ExplosionEvent;
|
|
||||||
|
|
||||||
public class UnstableSingularity extends SimpleFoiledItem
|
public class UnstableSingularity extends SimpleFoiledItem
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
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_);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,71 +0,0 @@
|
||||||
package dev.zontreck.otemod.ore;
|
|
||||||
|
|
||||||
|
|
||||||
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;
|
|
||||||
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;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
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 List<OreConfiguration.TargetBlockState> NETHER_VAULTSTEEL_ORE = List.of( OreConfiguration.target(OreFeatures.NETHER_ORE_REPLACEABLES, ModBlocks.NETHER_VAULT_STEEL_ORE_BLOCK.get().defaultBlockState()));
|
|
||||||
|
|
||||||
public static final List<OreConfiguration.TargetBlockState> OVERWORLD_ILUSIUM_ORE = List.of(OreConfiguration.target(OreFeatures.STONE_ORE_REPLACEABLES, ModBlocks.ILUSIUM_ORE_BLOCK.get().defaultBlockState()), OreConfiguration.target(OreFeatures.DEEPSLATE_ORE_REPLACEABLES, ModBlocks.DEEPSLATE_ILUSIUM_ORE_BLOCK.get().defaultBlockState()));
|
|
||||||
|
|
||||||
|
|
||||||
public static final Holder<ConfiguredFeature<OreConfiguration, ?>> ETERNIUM_ORE = FeatureUtils.register("eternium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ETERNIUM_ORE, 4));
|
|
||||||
|
|
||||||
public static final Holder<ConfiguredFeature<OreConfiguration, ?>> VAULTSTEEL_ORE = FeatureUtils.register("vault_steel_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_VAULTSTEEL_ORE, 3));
|
|
||||||
|
|
||||||
public static final Holder<ConfiguredFeature<OreConfiguration, ?>> ILUSIUM_ORE = FeatureUtils.register("ilusium_ore_block", Feature.ORE, new OreConfiguration(OVERWORLD_ILUSIUM_ORE, 8));
|
|
||||||
|
|
||||||
public static final Holder<ConfiguredFeature<OreConfiguration, ?>> VAULTSTEEL_ORE_NETHER = FeatureUtils.register("nether_vault_steel_ore_block", Feature.ORE, new OreConfiguration(NETHER_VAULTSTEEL_ORE, 3));
|
|
||||||
|
|
||||||
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> ILUSIUM_ORE_PLACED = PlacementUtils.register("ilusium_ore_placed", ILUSIUM_ORE, ModdedOrePlacement.commonOrePlacement(4, HeightRangePlacement.triangle(VerticalAnchor.absolute(-20), VerticalAnchor.absolute(30))));
|
|
||||||
|
|
||||||
public static final Holder<PlacedFeature> VAULT_STEEL_ORE_PLACED = PlacementUtils.register("vaultsteel_ore_placed", VAULTSTEEL_ORE, ModdedOrePlacement.commonOrePlacement(4, // Veins per chunk
|
|
||||||
HeightRangePlacement.triangle(VerticalAnchor.absolute(-63), VerticalAnchor.absolute(-40))));
|
|
||||||
|
|
||||||
public static final Holder<PlacedFeature> NETHER_VAULTSTEEL_ORE_PLACED = PlacementUtils.register("nether_vaultsteel_ore_placed", VAULTSTEEL_ORE_NETHER, ModdedOrePlacement.rareOrePlacement(4, // Veins per chunk
|
|
||||||
HeightRangePlacement.triangle(VerticalAnchor.absolute(1), VerticalAnchor.absolute(16))));
|
|
||||||
|
|
||||||
|
|
||||||
@SubscribeEvent
|
|
||||||
public static void generateOres(final BiomeLoadingEvent ev)
|
|
||||||
{
|
|
||||||
|
|
||||||
List<Holder<PlacedFeature>> base = ev.getGeneration().getFeatures(GenerationStep.Decoration.UNDERGROUND_ORES);
|
|
||||||
|
|
||||||
base.add(ETERNIUM_ORE_PLACED);
|
|
||||||
base.add(VAULT_STEEL_ORE_PLACED);
|
|
||||||
base.add(NETHER_VAULTSTEEL_ORE_PLACED);
|
|
||||||
base.add(ILUSIUM_ORE_PLACED);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -10,7 +10,7 @@ import net.minecraft.world.SimpleContainer;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.crafting.*;
|
import net.minecraft.world.item.crafting.*;
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
import net.minecraftforge.registries.ForgeRegistryEntry;
|
import net.minecraftforge.registries.ForgeRegistry;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public class CompressionChamberRecipe implements Recipe<SimpleContainer> {
|
public class CompressionChamberRecipe implements Recipe<SimpleContainer> {
|
||||||
|
@ -75,7 +75,7 @@ public class CompressionChamberRecipe implements Recipe<SimpleContainer> {
|
||||||
public static final String ID = "compressing";
|
public static final String ID = "compressing";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Serializer extends ForgeRegistryEntry<RecipeSerializer<?>> implements RecipeSerializer<CompressionChamberRecipe>
|
public static class Serializer implements RecipeSerializer<CompressionChamberRecipe>
|
||||||
{
|
{
|
||||||
public static final Serializer INSTANCE = new Serializer();
|
public static final Serializer INSTANCE = new Serializer();
|
||||||
public static final ResourceLocation ID = new ResourceLocation(OTEMod.MOD_ID, Type.ID);
|
public static final ResourceLocation ID = new ResourceLocation(OTEMod.MOD_ID, Type.ID);
|
||||||
|
|
|
@ -8,9 +8,9 @@ import dev.zontreck.libzontreck.vectors.WorldPosition;
|
||||||
import dev.zontreck.otemod.configs.OTEServerConfig;
|
import dev.zontreck.otemod.configs.OTEServerConfig;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraftforge.event.TickEvent;
|
import net.minecraftforge.event.TickEvent;
|
||||||
|
import net.minecraftforge.event.level.ExplosionEvent;
|
||||||
|
import net.minecraftforge.event.level.LevelEvent;
|
||||||
import net.minecraftforge.event.server.ServerStoppingEvent;
|
import net.minecraftforge.event.server.ServerStoppingEvent;
|
||||||
import net.minecraftforge.event.world.ExplosionEvent;
|
|
||||||
import net.minecraftforge.event.world.WorldEvent;
|
|
||||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||||
|
|
||||||
public class EventHandler {
|
public class EventHandler {
|
||||||
|
@ -18,17 +18,17 @@ public class EventHandler {
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onDetonate(ExplosionEvent ev)
|
public void onDetonate(ExplosionEvent ev)
|
||||||
{
|
{
|
||||||
if(ev.getWorld().isClientSide)return;
|
if(ev.getLevel().isClientSide)return;
|
||||||
|
|
||||||
//Entity explodes = ev.getExplosion().getSourceMob();
|
//Entity explodes = ev.getExplosion().getSourceMob();
|
||||||
// Register blocks to be healed
|
// Register blocks to be healed
|
||||||
WorldPosition wpos = new WorldPosition(new Vector3(ev.getExplosion().getPosition()), (ServerLevel) ev.getWorld());
|
WorldPosition wpos = new WorldPosition(new Vector3(ev.getExplosion().getPosition()), (ServerLevel) ev.getLevel());
|
||||||
|
|
||||||
if(OTEServerConfig.EXCLUDE_DIMS.get().contains(wpos.Dimension)){
|
if(OTEServerConfig.EXCLUDE_DIMS.get().contains(wpos.Dimension)){
|
||||||
// Dimension is on the exclusion list. Do not process.
|
// Dimension is on the exclusion list. Do not process.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
WorldProp wp = WorldProp.acquire((ServerLevel)ev.getWorld());
|
WorldProp wp = WorldProp.acquire((ServerLevel)ev.getLevel());
|
||||||
|
|
||||||
if(wp!=null){
|
if(wp!=null){
|
||||||
wp.onDetonate(ev);
|
wp.onDetonate(ev);
|
||||||
|
@ -44,21 +44,21 @@ public class EventHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onLoadLevel(WorldEvent.Load ev)
|
public void onLoadLevel(LevelEvent.Load ev)
|
||||||
{
|
{
|
||||||
if(!ev.getWorld().isClientSide() && ev.getWorld() instanceof ServerLevel)
|
if(!ev.getLevel().isClientSide() && ev.getLevel() instanceof ServerLevel)
|
||||||
{
|
{
|
||||||
healers.put((ServerLevel)ev.getWorld(), WorldProp.acquire((ServerLevel)ev.getWorld()));
|
healers.put((ServerLevel)ev.getLevel(), WorldProp.acquire((ServerLevel)ev.getLevel()));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onUnload(WorldEvent.Unload ev)
|
public void onUnload(LevelEvent.Unload ev)
|
||||||
{
|
{
|
||||||
if(!ev.getWorld().isClientSide())
|
if(!ev.getLevel().isClientSide())
|
||||||
{
|
{
|
||||||
healers.remove(ev.getWorld());
|
healers.remove(ev.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,16 +69,16 @@ public class EventHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onSaving(WorldEvent.Save ev)
|
public void onSaving(LevelEvent.Save ev)
|
||||||
{
|
{
|
||||||
WorldProp.SaveAll();
|
WorldProp.SaveAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onLevelTick(TickEvent.WorldTickEvent ev)
|
public void onLevelTick(TickEvent.LevelTickEvent ev)
|
||||||
{
|
{
|
||||||
if(!ev.world.isClientSide){
|
if(!ev.level.isClientSide){
|
||||||
WorldProp wp = WorldProp.acquire((ServerLevel)ev.world);
|
WorldProp wp = WorldProp.acquire((ServerLevel)ev.level);
|
||||||
if(wp!=null){
|
if(wp!=null){
|
||||||
wp.onTick();
|
wp.onTick();
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@ import net.minecraft.tags.BlockTags;
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
import net.minecraft.world.level.block.Blocks;
|
import net.minecraft.world.level.block.Blocks;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
import net.minecraftforge.event.world.ExplosionEvent;
|
import net.minecraftforge.event.level.ExplosionEvent;
|
||||||
|
|
||||||
public class WorldProp implements Supplier<Object>
|
public class WorldProp implements Supplier<Object>
|
||||||
{
|
{
|
||||||
|
@ -34,7 +34,7 @@ public class WorldProp implements Supplier<Object>
|
||||||
|
|
||||||
public void onDetonate(ExplosionEvent ev)
|
public void onDetonate(ExplosionEvent ev)
|
||||||
{
|
{
|
||||||
Level w = ev.getWorld();
|
Level w = ev.getLevel();
|
||||||
//int maxTicks = 0;
|
//int maxTicks = 0;
|
||||||
|
|
||||||
for(BlockPos p : ev.getExplosion().getToBlow())
|
for(BlockPos p : ev.getExplosion().getToBlow())
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
||||||
modLoader="javafml" #mandatory
|
modLoader="javafml" #mandatory
|
||||||
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
||||||
loaderVersion="[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
loaderVersion="[43,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
|
||||||
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
||||||
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
||||||
license="GPLv3"
|
license="GPLv3"
|
||||||
|
@ -21,7 +21,7 @@ modId="otemod" #mandatory
|
||||||
# see the associated build.gradle script for how to populate this completely automatically during a build
|
# see the associated build.gradle script for how to populate this completely automatically during a build
|
||||||
version="${file.jarVersion}" #mandatory
|
version="${file.jarVersion}" #mandatory
|
||||||
# A display name for the mod
|
# A display name for the mod
|
||||||
displayName="Thesholds Mod" #mandatory
|
displayName="Thesholds" #mandatory
|
||||||
# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
|
# 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
|
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
|
||||||
# A URL for the "homepage" for this mod, displayed in the mod UI
|
# A URL for the "homepage" for this mod, displayed in the mod UI
|
||||||
|
@ -51,7 +51,7 @@ modId="forge" #mandatory
|
||||||
# Does this dependency have to exist - if not, ordering below must be specified
|
# Does this dependency have to exist - if not, ordering below must be specified
|
||||||
mandatory=true #mandatory
|
mandatory=true #mandatory
|
||||||
# The version range of the dependency
|
# The version range of the dependency
|
||||||
versionRange="[40,)" #mandatory
|
versionRange="[43,)" #mandatory
|
||||||
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
||||||
|
@ -61,11 +61,11 @@ side="BOTH"
|
||||||
modId="minecraft"
|
modId="minecraft"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
# 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.2,1.20)"
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
side="BOTH"
|
side="BOTH"
|
||||||
[[dependencies.libzontreck]]
|
[[dependencies.otemod]]
|
||||||
modIf="libzontreck"
|
modId="libzontreck"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
versionRange="[1.10,1.11)"
|
versionRange="[1.10,1.11)"
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
{
|
|
||||||
"fallbacks": [
|
|
||||||
"metal"
|
|
||||||
],
|
|
||||||
"color": "33cccc",
|
|
||||||
"luminosity": 0,
|
|
||||||
"generator": {
|
|
||||||
"transformer": {
|
|
||||||
"type": "tconstruct:recolor_sprite",
|
|
||||||
"color_mapping": {
|
|
||||||
"type": "tconstruct:grey_to_color",
|
|
||||||
"palette": [
|
|
||||||
{
|
|
||||||
"grey": 0,
|
|
||||||
"color": "051414"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"grey": 63,
|
|
||||||
"color": "0f3d3d"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"grey": 102,
|
|
||||||
"color": "145252"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"grey": 140,
|
|
||||||
"color": "196666"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"grey": 178,
|
|
||||||
"color": "248f8f"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"grey": 216,
|
|
||||||
"color": "29a3a3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"grey": 255,
|
|
||||||
"color": "33cccc"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"supportedStats": [
|
|
||||||
"tconstruct:handle"
|
|
||||||
],
|
|
||||||
"ignoreMaterialStats": false
|
|
||||||
}
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load diff
|
@ -2,11 +2,10 @@
|
||||||
"type": "otemod:threshold",
|
"type": "otemod:threshold",
|
||||||
"generator": {
|
"generator": {
|
||||||
"type": "minecraft:noise",
|
"type": "minecraft:noise",
|
||||||
"seed": -1544839021,
|
|
||||||
"settings": "otemod:threshold",
|
"settings": "otemod:threshold",
|
||||||
"biome_source": {
|
"biome_source": {
|
||||||
"type": "minecraft:the_end",
|
"type": "minecraft:multi_noise",
|
||||||
"seed": -1544839021
|
"preset": "minecraft:overworld"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,16 +3,24 @@
|
||||||
"natural": true,
|
"natural": true,
|
||||||
"piglin_safe": false,
|
"piglin_safe": false,
|
||||||
"respawn_anchor_works": false,
|
"respawn_anchor_works": false,
|
||||||
"bed_works": false,
|
"bed_works": true,
|
||||||
"has_raids": true,
|
"has_raids": true,
|
||||||
"has_skylight": false,
|
"has_skylight": true,
|
||||||
"has_ceiling": false,
|
"has_ceiling": false,
|
||||||
"coordinate_scale": 1,
|
"coordinate_scale": 16,
|
||||||
"ambient_light": 1,
|
"ambient_light": 1,
|
||||||
"fixed_time": 1,
|
"fixed_time": 0,
|
||||||
"logical_height": 384,
|
"logical_height": 384,
|
||||||
"effects": "minecraft:the_end",
|
"effects": "minecraft:the_end",
|
||||||
"infiniburn": "#minecraft:infiniburn_overworld",
|
"infiniburn": "#minecraft:infiniburn_overworld",
|
||||||
"min_y": -64,
|
"min_y": -64,
|
||||||
"height": 384
|
"height": 384,
|
||||||
|
"monster_spawn_light_level": {
|
||||||
|
"type": "minecraft:uniform",
|
||||||
|
"value": {
|
||||||
|
"min_inclusive": 0,
|
||||||
|
"max_inclusive": 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"monster_spawn_block_light_limit": 7
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,20 @@
|
||||||
{
|
{
|
||||||
"ultrawarm": false,
|
"ultrawarm": false,
|
||||||
"natural": true,
|
"natural": false,
|
||||||
"piglin_safe": true,
|
"piglin_safe": false,
|
||||||
"respawn_anchor_works": false,
|
"respawn_anchor_works": false,
|
||||||
"bed_works": false,
|
"bed_works": false,
|
||||||
"has_raids": false,
|
"has_raids": true,
|
||||||
"has_skylight": true,
|
"has_skylight": true,
|
||||||
"has_ceiling": false,
|
"has_ceiling": false,
|
||||||
"coordinate_scale": 16,
|
"coordinate_scale": 16,
|
||||||
"ambient_light": 0,
|
"ambient_light": 0.5,
|
||||||
|
"fixed_time": 0,
|
||||||
"logical_height": 384,
|
"logical_height": 384,
|
||||||
"effects": "minecraft:the_end",
|
"effects": "minecraft:the_end",
|
||||||
"infiniburn": "#minecraft:infiniburn_overworld",
|
"infiniburn": "#minecraft:infiniburn_overworld",
|
||||||
"min_y": -64,
|
"min_y": -64,
|
||||||
"height": 384
|
"height": 384,
|
||||||
|
"monster_spawn_light_level": 0,
|
||||||
|
"monster_spawn_block_light_limit": 15
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
{
|
|
||||||
"type": "tconstruct:modifier",
|
|
||||||
"inputs": [
|
|
||||||
{
|
|
||||||
"tag": "forge:ingots/eternium"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"tools": {
|
|
||||||
"tag": "otemod:modifiable/eternium"
|
|
||||||
},
|
|
||||||
"slots": {
|
|
||||||
"upgrades": 1
|
|
||||||
},
|
|
||||||
"allow_crystal": true,
|
|
||||||
"result": {
|
|
||||||
"name": "otemod:eggables",
|
|
||||||
"level": 1
|
|
||||||
},
|
|
||||||
"max_level": 6
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"replace": false,
|
|
||||||
"values": [
|
|
||||||
"tconstruct:sword"
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -1,9 +0,0 @@
|
||||||
{
|
|
||||||
"replace": false,
|
|
||||||
"values": [
|
|
||||||
{
|
|
||||||
"id": "otemod:eternium_ingot",
|
|
||||||
"required": false
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -1,4 +0,0 @@
|
||||||
{
|
|
||||||
"otemod:mob_egging": "otemod:eggable",
|
|
||||||
"otemod:flight": "otemod:flying"
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"craftable": true,
|
|
||||||
"tier": 1,
|
|
||||||
"sortOrder": 20,
|
|
||||||
"hidden": false
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"craftable": true,
|
|
||||||
"tier": 1,
|
|
||||||
"sortOrder": 20,
|
|
||||||
"hidden": false
|
|
||||||
}
|
|
|
@ -1,28 +0,0 @@
|
||||||
{
|
|
||||||
"stats": {
|
|
||||||
"tconstruct:head": {
|
|
||||||
"durability": 1800,
|
|
||||||
"miningSpeed": 3.5,
|
|
||||||
"harvestTier": "minecraft:diamond",
|
|
||||||
"attack": 1.25
|
|
||||||
},
|
|
||||||
"tconstruct:extra": {},
|
|
||||||
"tconstruct:limb": {
|
|
||||||
"durability": 800,
|
|
||||||
"drawSpeed": 0.05,
|
|
||||||
"velocity": 0.05,
|
|
||||||
"accuracy": 0.05
|
|
||||||
},
|
|
||||||
"tconstruct:grip": {
|
|
||||||
"durability": 1.05,
|
|
||||||
"accuracy": 0.05,
|
|
||||||
"meleeAttack": 2.25
|
|
||||||
},
|
|
||||||
"tconstruct:handle": {
|
|
||||||
"durability": 1.05,
|
|
||||||
"miningSpeed": 1.05,
|
|
||||||
"attackSpeed": 1.05,
|
|
||||||
"attackDamage": 1.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,28 +0,0 @@
|
||||||
{
|
|
||||||
"stats": {
|
|
||||||
"tconstruct:head": {
|
|
||||||
"durability": 1800,
|
|
||||||
"miningSpeed": 3.5,
|
|
||||||
"harvestTier": "minecraft:diamond",
|
|
||||||
"attack": 1.25
|
|
||||||
},
|
|
||||||
"tconstruct:extra": {},
|
|
||||||
"tconstruct:limb": {
|
|
||||||
"durability": 800,
|
|
||||||
"drawSpeed": 0.05,
|
|
||||||
"velocity": 0.05,
|
|
||||||
"accuracy": 0.05
|
|
||||||
},
|
|
||||||
"tconstruct:grip": {
|
|
||||||
"durability": 1.05,
|
|
||||||
"accuracy": 0.05,
|
|
||||||
"meleeAttack": 2.25
|
|
||||||
},
|
|
||||||
"tconstruct:handle": {
|
|
||||||
"durability": 1.05,
|
|
||||||
"miningSpeed": 1.05,
|
|
||||||
"attackSpeed": 1.05,
|
|
||||||
"attackDamage": 1.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"default":{
|
|
||||||
"name": "otemod:eggables",
|
|
||||||
"level": 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +0,0 @@
|
||||||
{
|
|
||||||
"default":{
|
|
||||||
"name": "otemod:flying",
|
|
||||||
"level": 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
"type": "tconstruct:composable",
|
|
||||||
"level_display": {
|
|
||||||
"type": "tconstruct:unique",
|
|
||||||
"unique_until": 6
|
|
||||||
},
|
|
||||||
"tooltip_display": "always",
|
|
||||||
"modules": [
|
|
||||||
{
|
|
||||||
"type": "tconstruct:harvest_enchantment",
|
|
||||||
"name": "otemod:mob_egging",
|
|
||||||
"level": 1
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -1,12 +0,0 @@
|
||||||
{
|
|
||||||
"type": "tconstruct:composable",
|
|
||||||
"level_display": "tconstruct:no_levels",
|
|
||||||
"tooltip_display": "always",
|
|
||||||
"modules": [
|
|
||||||
{
|
|
||||||
"type": "tconstruct:constant_enchantment",
|
|
||||||
"name": "otemod:flight",
|
|
||||||
"level": 1
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load diff
|
@ -17,28 +17,7 @@
|
||||||
"min_y": 0,
|
"min_y": 0,
|
||||||
"height": 256,
|
"height": 256,
|
||||||
"size_horizontal": 2,
|
"size_horizontal": 2,
|
||||||
"size_vertical": 1,
|
"size_vertical": 1
|
||||||
"sampling": {
|
|
||||||
"xz_scale": 2,
|
|
||||||
"y_scale": 1,
|
|
||||||
"xz_factor": 80,
|
|
||||||
"y_factor": 160
|
|
||||||
},
|
|
||||||
"bottom_slide": {
|
|
||||||
"target": -0.234375,
|
|
||||||
"size": 7,
|
|
||||||
"offset": 1
|
|
||||||
},
|
|
||||||
"top_slide": {
|
|
||||||
"target": -23.4375,
|
|
||||||
"size": 64,
|
|
||||||
"offset": -46
|
|
||||||
},
|
|
||||||
"terrain_shaper": {
|
|
||||||
"offset": 0,
|
|
||||||
"factor": 0,
|
|
||||||
"jaggedness": 0
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"noise_router": {
|
"noise_router": {
|
||||||
"barrier": 0,
|
"barrier": 0,
|
||||||
|
@ -73,6 +52,7 @@
|
||||||
"vein_ridged": 0,
|
"vein_ridged": 0,
|
||||||
"vein_gap": 0
|
"vein_gap": 0
|
||||||
},
|
},
|
||||||
|
"spawn_target": [],
|
||||||
"surface_rule": {
|
"surface_rule": {
|
||||||
"type": "minecraft:sequence",
|
"type": "minecraft:sequence",
|
||||||
"sequence": []
|
"sequence": []
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"pack": {
|
"pack": {
|
||||||
"description": "Thresholds resources",
|
"description": "Thresholds resources",
|
||||||
"pack_format": 9,
|
"pack_format": 9,
|
||||||
"forge:resource_pack_format": 8,
|
"forge:resource_pack_format": 9,
|
||||||
"forge:data_pack_format": 9
|
"forge:data_pack_format": 10
|
||||||
}
|
}
|
||||||
}
|
}
|
Reference in a new issue