jkibbels/the_big_one
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
Jkibbels 2024-09-01 19:29:38 -04:00
parent 9001500056
commit b164b66297
4 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java
View File

@ -1,8 +1,5 @@
<<<<<<<< HEAD:src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java
package jesse.keeblarcraft.EventMgr;
========
package jesse.keeblarcraft.Utils;
>>>>>>>> d94f405 ([5] Initial implementation of some attribute stuff. Nothing in this commit actually works but the game still launches! Will need to move item and armor stuff to a more generic file as well to make it less unique so it can be used broadly. Directory structure extended to add items and resources):src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java
import jesse.CommonServerUtils;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;

25
src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java
View File

@ -1,25 +0,0 @@
<<<<<<<< HEAD:src/main/java/jesse/keeblarcraft/EventMgr/ServerTickListener.java
package jesse.keeblarcraft.EventMgr;
========
package jesse.keeblarcraft.Utils;
>>>>>>>> d94f405 ([5] Initial implementation of some attribute stuff. Nothing in this commit actually works but the game still launches! Will need to move item and armor stuff to a more generic file as well to make it less unique so it can be used broadly. Directory structure extended to add items and resources):src/main/java/jesse/keeblarcraft/Utils/ServerTickListener.java
import jesse.CommonServerUtils;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.server.MinecraftServer;
// This interface is responsible for the end tick of a server world event tick
public class ServerTickListener implements ServerTickEvents.EndTick {
CommonServerUtils config = new CommonServerUtils();
@Override
public void onEndTick(MinecraftServer server) {
if (server != null) {
config.SetServerInstance(server);
}
}
// Static method to register the server tick listener
public static void InitializeServerTicks() {
ServerTickEvents.END_SERVER_TICK.register(new ServerTickListener());
}
}

BIN
src/main/resources/assets/keeblarcraft/textures/item/money_block.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

2
src/main/resources/data/keeblarcraft/loot_tables/blocks/money_block.json
View File

@ -5,7 +5,7 @@
"bonus_rolls": 0.0,
"conditions": [
{
"conditions": "minecraft:survives_explosions"
"condition": "minecraft:survives_explosion"
}
],
"entries": [