Skip to content

Commit ca79eee

Browse files
committed
some work
1 parent 8fe7cd1 commit ca79eee

14 files changed

Lines changed: 181 additions & 112 deletions

File tree

nms-patches/net/minecraft/advancements/AdvancementHolder.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

nms-patches/net/minecraft/advancements/AdvancementTree.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

nms-patches/net/minecraft/stats/ServerRecipeBook.patch

Lines changed: 0 additions & 38 deletions
This file was deleted.

nms-patches/net/minecraft/stats/ServerStatsCounter.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

nms-patches/net/minecraft/stats/StatsCounter.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

projects/neotenet/src/main/java/org/teneted/neotenet/NeoTenet.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@ public class NeoTenet {
1818
private static final String RESET = "\u001B[0m";
1919

2020
public static void run() throws Exception {
21+
String[][] letters = {
22+
{"* *","** *","* * *","* **","* *","* *","* *"}, // N
23+
{"*****","* ","*****","* ","*****","* ","*****"}, // E
24+
{" *** ","* *","* *","* *","* *","* *"," *** "}, // O
25+
{"*****"," * "," * "," * "," * "," * "," * "}, // T
26+
{"*****","* ","*****","* ","*****","* ","*****"}, // E
27+
{"* *","** *","* * *","* **","* *","* *","* *"}, // N
28+
{"*****","* ","*****","* ","*****","* ","*****"}, // E
29+
{"*****"," * "," * "," * "," * "," * "," * "} // T
30+
};
31+
for (int row = 0; row < 7; row++) {
32+
for (String[] letter : letters)
33+
System.out.print(letter[row] + " ");
34+
System.out.println();
35+
}
2136
System.out.println(YELLOW + "Welcome to NeoTenet for NeoForge " + NeoForgeVersion.getVersion() + ", Java " + javaVersion + RESET);
2237

2338
ZoneId zoneId = ZoneId.of("Asia/Shanghai");
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package org.teneted.neotenet.mixin;
2+
3+
import org.objectweb.asm.tree.ClassNode;
4+
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
5+
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
6+
import org.teneted.neotenet.NeoTenet;
7+
8+
import java.util.List;
9+
import java.util.Set;
10+
11+
public class NeoTenetMixinPlugin implements IMixinConfigPlugin {
12+
@Override
13+
public void onLoad(String mixinPackage) {
14+
try {
15+
NeoTenet.run();
16+
} catch (Exception ex) {
17+
NeoTenet.LOGGER.error("Failed to load NeoTenet Server..., caused by " + ex.getCause());
18+
throw new RuntimeException(ex);
19+
}
20+
}
21+
22+
@Override
23+
public String getRefMapperConfig() {
24+
return null;
25+
}
26+
27+
@Override
28+
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
29+
return true;
30+
}
31+
32+
@Override
33+
public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
34+
35+
}
36+
37+
@Override
38+
public List<String> getMixins() {
39+
return null;
40+
}
41+
42+
@Override
43+
public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
44+
45+
}
46+
47+
@Override
48+
public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
49+
50+
}
51+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.teneted.neotenet.mixin.core.network;
2+
3+
import io.netty.channel.Channel;
4+
import io.netty.channel.ChannelFuture;
5+
import net.minecraft.network.Connection;
6+
import org.spongepowered.asm.mixin.Mixin;
7+
import org.spongepowered.asm.mixin.Shadow;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Redirect;
10+
11+
@Mixin(Connection.class)
12+
public class ConnectionMixin {
13+
14+
@Shadow private boolean disconnectionHandled;
15+
public String hostname = ""; // CraftBukkit - add field
16+
17+
@Redirect(method = "disconnect(Lnet/minecraft/network/DisconnectionDetails;)V", at = @At(value = "INVOKE", target = "Lio/netty/channel/Channel;close()Lio/netty/channel/ChannelFuture;"))
18+
private ChannelFuture neotenet$noDisconnectTwiceWarn(Channel instance) {
19+
return instance.close();
20+
}
21+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package org.teneted.neotenet.mixin.core.network.syncher;
2+
3+
import net.minecraft.network.syncher.EntityDataAccessor;
4+
import net.minecraft.network.syncher.SynchedEntityData;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.Shadow;
7+
import org.teneted.neotenet.injection.network.syncher.SynchedEntityDataInjection;
8+
9+
@Mixin(SynchedEntityData.class)
10+
public abstract class SynchedEntityDataMixin implements SynchedEntityDataInjection {
11+
12+
13+
@Shadow
14+
protected abstract <T> SynchedEntityData.DataItem<T> getItem(EntityDataAccessor<T> accessor);
15+
16+
@Shadow
17+
private boolean isDirty;
18+
19+
@Override
20+
// CraftBukkit start - add method from above
21+
public <T> void markDirty(EntityDataAccessor<T> entitydataaccessor) {
22+
this.getItem(entitydataaccessor).setDirty(true);
23+
this.isDirty = true;
24+
}
25+
// CraftBukkit end
26+
}

projects/neotenet/src/main/java/org/teneted/neotenet/mixin/core/MinecraftServerMixin.java renamed to projects/neotenet/src/main/java/org/teneted/neotenet/mixin/core/server/MinecraftServerMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.teneted.neotenet.mixin.core;
1+
package org.teneted.neotenet.mixin.core.server;
22

33
import net.minecraft.server.MinecraftServer;
44
import org.spongepowered.asm.mixin.Mixin;

0 commit comments

Comments
 (0)