MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make some QOL fixes to Thresholds

Browse source
This commit is contained in:
zontreck 2024-01-22 00:52:13 -07:00
parent c344b5c0b6
commit 43575fe2c7
12 changed files with 289 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradle.properties
View file

@ -3,7 +3,7 @@
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
libzontreck=1.10.011624.1712 libzontreck=1.10.012124.1709
## Environment Properties ## Environment 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.011724.0213 mod_version=1.4.012224.0025
# 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

4
src/main/java/dev/zontreck/otemod/OTEMod.java
View file

@ -9,6 +9,8 @@ import dev.zontreck.libzontreck.util.ChatHelpers;
import dev.zontreck.libzontreck.util.ServerUtilities; import dev.zontreck.libzontreck.util.ServerUtilities;
import dev.zontreck.libzontreck.vectors.Vector3; import dev.zontreck.libzontreck.vectors.Vector3;
import dev.zontreck.otemod.effects.ModEffects; import dev.zontreck.otemod.effects.ModEffects;
import dev.zontreck.otemod.enchantments.FlightEnchantment;
import dev.zontreck.otemod.enchantments.NightVisionEnchantment;
import dev.zontreck.otemod.implementation.CreativeModeTabs; import dev.zontreck.otemod.implementation.CreativeModeTabs;
import dev.zontreck.otemod.implementation.InventoryBackup; import dev.zontreck.otemod.implementation.InventoryBackup;
import dev.zontreck.otemod.implementation.Messages; import dev.zontreck.otemod.implementation.Messages;
@ -105,6 +107,8 @@ public class OTEMod
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(OreGenerator.class);
MinecraftForge.EVENT_BUS.register(FlightEnchantment.class);
MinecraftForge.EVENT_BUS.register(NightVisionEnchantment.class);
ModMenuTypes.CONTAINERS.register(bus); ModMenuTypes.CONTAINERS.register(bus);

1
src/main/java/dev/zontreck/otemod/enchantments/FlightEnchantment.java
View file

@ -28,7 +28,6 @@ import net.minecraftforge.fml.common.Mod;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@Mod.EventBusSubscriber(modid = OTEMod.MOD_ID)
public class FlightEnchantment extends Enchantment public class FlightEnchantment extends Enchantment
{ {

2
src/main/java/dev/zontreck/otemod/enchantments/MobEggEnchantment.java
View file

@ -67,7 +67,7 @@ public class MobEggEnchantment extends Enchantment
CHANCE *= (level / 0.5); CHANCE *= (level / 0.5);
CHANCE += bias; CHANCE += bias;
double rng = Math.random()*100000; double rng = Math.random()*10000;
if(OTEServerConfig.DEBUG.get()) if(OTEServerConfig.DEBUG.get())
{ {

1
src/main/java/dev/zontreck/otemod/enchantments/NightVisionEnchantment.java
View file

@ -19,7 +19,6 @@ import net.minecraftforge.fml.common.Mod;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@Mod.EventBusSubscriber(modid = OTEMod.MOD_ID)
public class NightVisionEnchantment extends Enchantment public class NightVisionEnchantment extends Enchantment
{ {

12
src/main/java/dev/zontreck/otemod/ore/OreGenerator.java
View file

@ -38,22 +38,22 @@ public class OreGenerator {
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, ?>> 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, 2)); 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, ?>> 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, 2)); 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", public static final Holder<PlacedFeature> ETERNIUM_ORE_PLACED = PlacementUtils.register("eternium_ore_placed",
ETERNIUM_ORE, ModdedOrePlacement.rareOrePlacement(3, // VeinsPerChunk ETERNIUM_ORE, ModdedOrePlacement.commonOrePlacement(3, // VeinsPerChunk
HeightRangePlacement.triangle(VerticalAnchor.absolute(-20), VerticalAnchor.absolute(20)))); 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> 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.rareOrePlacement(4, // Veins per chunk 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(-50)))); 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(5, // Veins per chunk 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)))); HeightRangePlacement.triangle(VerticalAnchor.absolute(1), VerticalAnchor.absolute(16))));

5
src/main/resources/data/forge/tags/blocks/uncrafting_tables.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"#forge:uncrafting_tables/uncrafter"
]
}

6
src/main/resources/data/forge/tags/blocks/uncrafting_tables/uncrafter.json Normal file
View file

@ -0,0 +1,6 @@
{
"values": [
"twilightforest:uncrafting_table",
"minecraft:crafting_table"
]
}

13
src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_chunk_polish.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "create:sandpaper_polishing",
"ingredients": [
{
"item": "biomesoplenty:rose_quartz_chunk"
}
],
"results": [
{
"item": "create:polished_rose_quartz"
}
]
}

13
src/main/resources/data/otemod/recipes/sandpaper/bop_rosequartz_shard_polish.json Normal file
View file

@ -0,0 +1,13 @@
{
"type": "create:sandpaper_polishing",
"ingredients": [
{
"item": "biomesoplenty:rose_quartz_shard"
}
],
"results": [
{
"item": "create:polished_rose_quartz"
}
]
}

414
src/main/resources/data/otemod/worldgen/noise_settings/resource.json
View file

File diff suppressed because it is too large Load diff

68
src/main/resources/data/otemod/worldgen/noise_settings/threshold.json
View file

@ -1,5 +1,5 @@
{ {
"sea_level": 0, "sea_level": -64,
"disable_mob_generation": true, "disable_mob_generation": true,
"aquifers_enabled": false, "aquifers_enabled": false,
"ore_veins_enabled": false, "ore_veins_enabled": false,
@ -8,11 +8,14 @@
"Name": "minecraft:stone" "Name": "minecraft:stone"
}, },
"default_fluid": { "default_fluid": {
"Name": "minecraft:water" "Name": "minecraft:water",
"Properties": {
"level": "0"
}
}, },
"noise": { "noise": {
"min_y": -64, "min_y": 0,
"height": 384, "height": 256,
"size_horizontal": 2, "size_horizontal": 2,
"size_vertical": 1, "size_vertical": 1,
"sampling": { "sampling": {
@ -33,7 +36,7 @@
}, },
"terrain_shaper": { "terrain_shaper": {
"offset": 0, "offset": 0,
"factor": 1, "factor": 0,
"jaggedness": 0 "jaggedness": 0
} }
}, },
@ -42,43 +45,36 @@
"fluid_level_floodedness": 0, "fluid_level_floodedness": 0,
"fluid_level_spread": 0, "fluid_level_spread": 0,
"lava": 0, "lava": 0,
"temperature": 0, "temperature": {
"vegetation": 0, "type": "minecraft:shifted_noise",
"continents": 0, "noise": "minecraft:temperature",
"erosion": 0, "xz_scale": 0.25,
"depth": 0, "y_scale": 0,
"ridges": 0, "shift_x": "minecraft:shift_x",
"initial_density_without_jaggedness": { "shift_y": 0,
"type": "minecraft:cache_2d", "shift_z": "minecraft:shift_z"
"argument": {
"type": "minecraft:end_islands"
}
}, },
"final_density": { "vegetation": {
"type": "minecraft:squeeze", "type": "minecraft:shifted_noise",
"argument": { "noise": "minecraft:vegetation",
"type": "minecraft:mul", "xz_scale": 0.25,
"argument1": 0.64, "y_scale": 0,
"argument2": { "shift_x": "minecraft:shift_x",
"type": "minecraft:interpolated", "shift_y": 0,
"argument": { "shift_z": "minecraft:shift_z"
"type": "minecraft:blend_density",
"argument": {
"type": "minecraft:slide",
"argument": "minecraft:end/sloped_cheese"
}
}
}
}
}, },
"continents": "minecraft:overworld/continents",
"erosion": "minecraft:overworld/erosion",
"depth": "minecraft:overworld/depth",
"ridges": "minecraft:overworld/ridges",
"initial_density_without_jaggedness": 0,
"final_density": 0,
"vein_toggle": 0, "vein_toggle": 0,
"vein_ridged": 0, "vein_ridged": 0,
"vein_gap": 0 "vein_gap": 0
}, },
"surface_rule": { "surface_rule": {
"type": "minecraft:block", "type": "minecraft:sequence",
"result_state": { "sequence": []
"Name": "minecraft:end_stone"
}
} }
} }