Skip to content

Commit

Permalink
Merge branch 'master' into 1.21.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	gradle.properties
#	src/main/java/net/frozenblock/lib/block/api/FrozenCeilingHangingSignBlock.java
#	src/main/java/net/frozenblock/lib/block/api/FrozenSignBlock.java
#	src/main/java/net/frozenblock/lib/block/api/FrozenWallHangingSignBlock.java
#	src/main/java/net/frozenblock/lib/block/api/FrozenWallSignBlock.java
#	src/main/java/net/frozenblock/lib/ingamedevtools/RegisterInGameDevTools.java
#	src/main/java/net/frozenblock/lib/item/api/HeavyItemDamageRegistry.java
#	src/main/java/net/frozenblock/lib/recipe/mixin/ItemValueMixin.java
#	src/main/java/net/frozenblock/lib/stencil/api/StencilRenderer.java
  • Loading branch information
Treetrain1 committed Jan 5, 2025
2 parents 98e79dd + 7357166 commit 30883bb
Show file tree
Hide file tree
Showing 523 changed files with 583 additions and 584 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Make sure to clear this after each release
Put changelog here:

-----------------
- Fixed a critical crash during datagen on 1.21.2+.
- Removed the `loot table whacker.`
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ dependencies {

// ExJson
//relocModApi("org.exjson:xjs-data:$xjs_data_version")
relocModApi("com.github.Treetrain1:xjs-data:infinity-compat-SNAPSHOT")
relocModApi("com.github.Treetrain1:xjs-data:f39681b4bb")
relocModApi("org.exjson:xjs-compat:$xjs_compat_version")
relocModApi("com.personthecat:fresult:$fresult_version")
compileOnly("org.projectlombok:lombok:1.18.34")?.let { annotationProcessor(it) }
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
min_loader_version=0.16.8

# Mod Properties
mod_version = 1.9.8
mod_version = 1.9.10
maven_group = net.frozenblock
archives_base_name = FrozenLib

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/frozenblock/lib/FrozenBools.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/frozenblock/lib/FrozenClient.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -49,6 +49,8 @@ public final class FrozenClient implements ClientModInitializer {

@Override
public void onInitializeClient() {
FrozenMain.init();

FrozenClientRegistry.initRegistry();
ModIntegrations.initializePreFreeze(); // Mod integrations must run after normal mod initialization

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/frozenblock/lib/FrozenLogUtils.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
14 changes: 11 additions & 3 deletions src/main/java/net/frozenblock/lib/FrozenMain.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -70,13 +70,16 @@
import org.quiltmc.qsl.frozenblock.misc.datafixerupper.impl.ServerFreezer;

public final class FrozenMain extends FrozenModInitializer {
public static boolean INITIALIZED = false;

public FrozenMain() {
super(FrozenSharedConstants.MOD_ID);
}

@Override
public void onInitialize(String modId, ModContainer container) {
public static void init() {
if (INITIALIZED) return;
INITIALIZED = true;

FrozenRegistry.initRegistry();

// QUILT INIT
Expand Down Expand Up @@ -104,6 +107,11 @@ public void onInitialize(String modId, ModContainer container) {
ServerCapeData.init();

FrozenMainEntrypoint.EVENT.invoker().init(); // includes dev init
}

@Override
public void onInitialize(String modId, ModContainer container) {
init();

ArgumentTypeInfos.register(
BuiltInRegistries.COMMAND_ARGUMENT_TYPE,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/frozenblock/lib/FrozenServer.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/frozenblock/lib/block/api/FaceBlock.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/frozenblock/lib/cape/api/CapeUtil.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/frozenblock/lib/cape/impl/Cape.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024 FrozenBlock
* Copyright (C) 2024-2025 FrozenBlock
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Loading

0 comments on commit 30883bb

Please sign in to comment.