-
Notifications
You must be signed in to change notification settings - Fork 293
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4410 from IThundxr/zeta
feat: Zeta
Showing
25 changed files
with
191 additions
and
204 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
src/main/java/org/violetmoon/zeta/event/bus/helpers/README.md
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
src/main/java/org/violetmoon/zeta/event/play/ZServerTick.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package org.violetmoon.zeta.event.play; | ||
|
|
||
| import net.minecraft.server.MinecraftServer; | ||
| import org.violetmoon.zeta.event.bus.IZetaPlayEvent; | ||
|
|
||
| public interface ZServerTick extends IZetaPlayEvent { | ||
| MinecraftServer getServer(); | ||
|
|
||
| interface Start extends ZServerTick { } | ||
| interface End extends ZServerTick { } | ||
| } |
11 changes: 11 additions & 0 deletions
11
src/main/java/org/violetmoon/zeta/event/play/loading/ZWandererTrades.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package org.violetmoon.zeta.event.play.loading; | ||
|
|
||
| import net.minecraft.world.entity.npc.VillagerTrades; | ||
| import org.violetmoon.zeta.event.bus.IZetaPlayEvent; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public interface ZWandererTrades extends IZetaPlayEvent { | ||
| List<VillagerTrades.ItemListing> getGenericTrades(); | ||
| List<VillagerTrades.ItemListing> getRareTrades(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/main/java/org/violetmoon/zetaimplforge/event/play/ForgeZServerTick.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package org.violetmoon.zetaimplforge.event.play; | ||
|
|
||
| import net.minecraft.server.MinecraftServer; | ||
| import net.minecraftforge.event.TickEvent; | ||
| import org.violetmoon.zeta.event.play.ZServerTick; | ||
|
|
||
| public class ForgeZServerTick implements ZServerTick { | ||
| private final TickEvent.ServerTickEvent e; | ||
|
|
||
| public ForgeZServerTick(TickEvent.ServerTickEvent e) { | ||
| this.e = e; | ||
| } | ||
|
|
||
| @Override | ||
| public MinecraftServer getServer() { | ||
| return e.getServer(); | ||
| } | ||
|
|
||
| public static class Start extends ForgeZServerTick implements ZServerTick.Start { | ||
| public Start(TickEvent.ServerTickEvent e) { | ||
| super(e); | ||
| } | ||
| } | ||
|
|
||
| public static class End extends ForgeZServerTick implements ZServerTick.End { | ||
| public End(TickEvent.ServerTickEvent e) { | ||
| super(e); | ||
| } | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZWandererTrades.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package org.violetmoon.zetaimplforge.event.play.loading; | ||
|
|
||
| import net.minecraft.world.entity.npc.VillagerTrades; | ||
| import net.minecraftforge.event.village.WandererTradesEvent; | ||
| import org.violetmoon.zeta.event.play.loading.ZWandererTrades; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class ForgeZWandererTrades implements ZWandererTrades { | ||
| private final WandererTradesEvent e; | ||
|
|
||
| public ForgeZWandererTrades(WandererTradesEvent e) { | ||
| this.e = e; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public List<VillagerTrades.ItemListing> getGenericTrades() { | ||
| return e.getGenericTrades(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<VillagerTrades.ItemListing> getRareTrades() { | ||
| return e.getRareTrades(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters