diff --git a/build.gradle b/build.gradle index 74727ce..1dc0ccb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,12 @@ -subprojects { +allprojects { apply plugin: "java" +} - group = "net.meshmc" - version = project.meshVersion - archivesBaseName = project.name +group = project.mavenGroup +version = project.modVersion +archivesBaseName = project.modid +subprojects { repositories { mavenCentral() maven { @@ -25,26 +27,44 @@ subprojects { } } - // copy the main artifacts to root build folder after build - if(project.name == "mesh-loader") { - tasks.getByName("build").doLast { - copy { - from "${project.rootProject.rootDir}/${project.name}/build/libs/${project.name}-${project.meshVersion}.jar" - into "${project.rootProject.rootDir}/build" - } - } - } else if(project.name != "mesh-core") { - // standalone artifacts - tasks.getByName("build").doLast { - copy { - from "${project.rootProject.rootDir}/${project.name}/build/libs/${project.name}-${project.meshVersion}-standalone.jar" - into "${project.rootProject.rootDir}/build" - } - } + dependencies { + implementation "net.meshmc:mesh-loader:$loaderVersion" + implementation "dev.tigr:simpleevents:1.3" } +} + +configurations { + embeddedLibs + embeddedJars +} - clean { - delete "${project.rootProject.rootDir}/build" +repositories { + maven { + name = "MeshMC" + url = "https://maven.meshmc.net" } } +dependencies { + embeddedLibs "dev.tigr:simpleevents:1.3" + + embeddedLibs(project(":core")) { + transitive = false + } + + subprojects.forEach { + if(it.name.matches("v[0-9]+_[0-9]+_([0-9]+|x)")) embeddedJars(it) { + transitive = false + } + } +} + +jar { + from { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + configurations.embeddedLibs.collect { + it.isDirectory() ? it : zipTree(it) + } + } + from(configurations.embeddedJars) +} \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 0000000..f48a435 --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,32 @@ +group = project.mavenGroup +version = project.modVersion +archivesBaseName = project.modid + "-" + project.name + +repositories { + mavenCentral() + maven { + name = "MeshMC" + url = "https://maven.meshmc.net" + } +} + +dependencies { + implementation "org.apache.logging.log4j:log4j-api:2.17.0" + implementation "com.google.guava:guava:31.0.1-jre" + implementation 'io.netty:netty-all:4.1.86.Final' + implementation "com.mojang:authlib:1.5.21" + implementation "org.joml:joml:1.10.4" +} + +processResources { + inputs.property "version", project.version + + filesMatching("${project.modid}.mesh.json") { + expand "version": project.version + } +} + +jar { + exclude "net/meshmc/mesh/MeshStatics.class" + exclude "net/meshmc/mesh/statics/*" +} diff --git a/core/src/main/java/net/meshmc/mesh/IMesh.java b/core/src/main/java/net/meshmc/mesh/IMesh.java new file mode 100644 index 0000000..1983e0d --- /dev/null +++ b/core/src/main/java/net/meshmc/mesh/IMesh.java @@ -0,0 +1,13 @@ +package net.meshmc.mesh; + +import net.meshmc.mesh.api.client.Minecraft; +import net.meshmc.mesh.api.render.Renderer; +import net.meshmc.mesh.api.util.Utilities; + +public interface IMesh { + Minecraft getMinecraft(); + + Renderer getRenderer(); + + Utilities getUtilities(); +} diff --git a/core/src/main/java/net/meshmc/mesh/MeshAPI.java b/core/src/main/java/net/meshmc/mesh/MeshAPI.java new file mode 100644 index 0000000..e117c02 --- /dev/null +++ b/core/src/main/java/net/meshmc/mesh/MeshAPI.java @@ -0,0 +1,43 @@ +package net.meshmc.mesh; + +import dev.tigr.simpleevents.EventManager; +import net.meshmc.mesh.api.client.Minecraft; +import net.meshmc.mesh.api.render.Renderer; +import net.meshmc.mesh.api.util.Utilities; +import net.meshmc.mesh.event.MeshEventManager; +import net.meshmc.mesh.loader.MeshLoader; +import net.meshmc.mesh.loader.Mod; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class MeshAPI implements Mod.Initializer { + private static final Logger LOGGER = LogManager.getLogger("Mesh API"); + private static final EventManager EVENT_MANAGER = new MeshEventManager(); + + @Mod.Interface + private static IMesh MESH; + + @Override + public void init(Mod mod) { + LOGGER.info("Mesh API loaded in {} {}!", + MeshLoader.getInstance().getRuntime().name().toLowerCase(), + MeshLoader.getInstance().getGameVersion()); + // TODO: HANDLE VERSION NOT LOADED + } + + public static EventManager getEventManager() { + return EVENT_MANAGER; + } + + public static Minecraft getMinecraft() { + return MESH.getMinecraft(); + } + + public static Renderer getRenderer() { + return MESH.getRenderer(); + } + + public static Utilities getUtilities() { + return MESH.getUtilities(); + } +} \ No newline at end of file diff --git a/mesh-core/src/main/java/net/meshmc/mesh/MeshStatics.java b/core/src/main/java/net/meshmc/mesh/MeshStatics.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/MeshStatics.java rename to core/src/main/java/net/meshmc/mesh/MeshStatics.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/AbstractMesh.java b/core/src/main/java/net/meshmc/mesh/api/AbstractMesh.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/AbstractMesh.java rename to core/src/main/java/net/meshmc/mesh/api/AbstractMesh.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/advancement/Advancement.java b/core/src/main/java/net/meshmc/mesh/api/advancement/Advancement.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/advancement/Advancement.java rename to core/src/main/java/net/meshmc/mesh/api/advancement/Advancement.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/advancement/AdvancementProgress.java b/core/src/main/java/net/meshmc/mesh/api/advancement/AdvancementProgress.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/advancement/AdvancementProgress.java rename to core/src/main/java/net/meshmc/mesh/api/advancement/AdvancementProgress.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/block/Block.java b/core/src/main/java/net/meshmc/mesh/api/block/Block.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/block/Block.java rename to core/src/main/java/net/meshmc/mesh/api/block/Block.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/block/BlockState.java b/core/src/main/java/net/meshmc/mesh/api/block/BlockState.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/block/BlockState.java rename to core/src/main/java/net/meshmc/mesh/api/block/BlockState.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/block/MapColor.java b/core/src/main/java/net/meshmc/mesh/api/block/MapColor.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/block/MapColor.java rename to core/src/main/java/net/meshmc/mesh/api/block/MapColor.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/block/Material.java b/core/src/main/java/net/meshmc/mesh/api/block/Material.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/block/Material.java rename to core/src/main/java/net/meshmc/mesh/api/block/Material.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/client/Minecraft.java b/core/src/main/java/net/meshmc/mesh/api/client/Minecraft.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/client/Minecraft.java rename to core/src/main/java/net/meshmc/mesh/api/client/Minecraft.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/client/Session.java b/core/src/main/java/net/meshmc/mesh/api/client/Session.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/client/Session.java rename to core/src/main/java/net/meshmc/mesh/api/client/Session.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/client/input/MovementInput.java b/core/src/main/java/net/meshmc/mesh/api/client/input/MovementInput.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/client/input/MovementInput.java rename to core/src/main/java/net/meshmc/mesh/api/client/input/MovementInput.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/Entity.java b/core/src/main/java/net/meshmc/mesh/api/entity/Entity.java similarity index 99% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/Entity.java rename to core/src/main/java/net/meshmc/mesh/api/entity/Entity.java index 15ba4b1..5297862 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/Entity.java +++ b/core/src/main/java/net/meshmc/mesh/api/entity/Entity.java @@ -416,7 +416,7 @@ default boolean startRidingEntity(Entity entity) { void handleStatus(byte status); // animateDamage - void performHurtAnimation(); + void performHurtAnimation(float damageTiltYaw); // TODO: HELD ITEMS AND ARMOR (ItemStack) diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/EntityType.java b/core/src/main/java/net/meshmc/mesh/api/entity/EntityType.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/EntityType.java rename to core/src/main/java/net/meshmc/mesh/api/entity/EntityType.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/MoverType.java b/core/src/main/java/net/meshmc/mesh/api/entity/MoverType.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/MoverType.java rename to core/src/main/java/net/meshmc/mesh/api/entity/MoverType.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/EntityLiving.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/EntityLiving.java similarity index 97% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/EntityLiving.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/EntityLiving.java index 9e4433f..94557c5 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/EntityLiving.java +++ b/core/src/main/java/net/meshmc/mesh/api/entity/living/EntityLiving.java @@ -33,7 +33,7 @@ public interface EntityLiving extends Entity { int getMaxHurtTime(); void setMaxHurtTime(int value); - float getAttackedAtYaw(); // knockbackVelocity? + Float getAttackedAtYaw(); // knockbackVelocity? void setAttackedAtYaw(float value); int getDeathTime(); @@ -48,13 +48,13 @@ public interface EntityLiving extends Entity { int getLastAttackedTicks(); void setLastAttackedTicks(int value); - float getPrevSwingDistance(); + Float getPrevSwingDistance(); void setPrevSwingDistance(float value); - float getSwingDistance(); + Float getSwingDistance(); void setSwingDistance(float value); - float getLimbAngle(); + Float getLimbAngle(); void setLimbAngle(float value); // TODO: maxHurtResistantTime? defaultMaxHealt? @@ -79,7 +79,7 @@ public interface EntityLiving extends Entity { float getPrevHeadYaw(); void setPrevHeadYaw(float value); - float getAirStrafingSpeed(); + Float getAirStrafingSpeed(); void setAirStrafingSpeed(float value); EntityPlayer getAttackingPlayer(); @@ -246,7 +246,7 @@ public interface EntityLiving extends Entity { void fallDamage(float fallDistance, float damageMultiplier); - void hurtAnimation(); + void hurtAnimation(float hurtTiltYaw); int getArmorValue(); diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/EntitySlime.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/EntitySlime.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/EntitySlime.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/EntitySlime.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/EntityMob.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/EntityMob.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/EntityMob.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/EntityMob.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityGolem.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityGolem.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityGolem.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityGolem.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityIronGolem.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityIronGolem.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityIronGolem.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityIronGolem.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityShulker.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityShulker.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityShulker.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntityShulker.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntitySnowGolem.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntitySnowGolem.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntitySnowGolem.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/golem/EntitySnowGolem.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityBlaze.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityBlaze.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityBlaze.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityBlaze.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityCreeper.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityCreeper.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityCreeper.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityCreeper.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEnderman.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEnderman.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEnderman.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEnderman.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEndermite.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEndermite.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEndermite.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityEndermite.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityGiant.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityGiant.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityGiant.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityGiant.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityHostile.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityHostile.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityHostile.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityHostile.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntitySilverfish.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntitySilverfish.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntitySilverfish.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntitySilverfish.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityVex.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityVex.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityVex.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityVex.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityWither.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityWither.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityWither.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityWither.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityZoglin.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityZoglin.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityZoglin.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/EntityZoglin.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityElderGuardian.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityElderGuardian.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityElderGuardian.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityElderGuardian.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityGuardian.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityGuardian.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityGuardian.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/guardian/EntityGuardian.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglin.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglin.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglin.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglin.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinAbstract.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinAbstract.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinAbstract.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinAbstract.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinBrute.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinBrute.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinBrute.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/piglin/EntityPiglinBrute.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityEvoker.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityEvoker.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityEvoker.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityEvoker.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllagerSpellcaster.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllagerSpellcaster.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllagerSpellcaster.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllagerSpellcaster.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllusioner.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllusioner.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllusioner.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityIllusioner.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityPillager.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityPillager.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityPillager.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityPillager.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRaiderAbstract.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRaiderAbstract.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRaiderAbstract.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRaiderAbstract.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRavager.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRavager.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRavager.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityRavager.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityVindicator.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityVindicator.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityVindicator.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityVindicator.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityWitch.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityWitch.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityWitch.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/raider/EntityWitch.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeleton.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeleton.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeleton.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeleton.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeletonAbstract.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeletonAbstract.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeletonAbstract.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntitySkeletonAbstract.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityStray.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityStray.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityStray.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityStray.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityWitherSkeleton.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityWitherSkeleton.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityWitherSkeleton.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/skeleton/EntityWitherSkeleton.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntityCaveSpider.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntityCaveSpider.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntityCaveSpider.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntityCaveSpider.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntitySpider.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntitySpider.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntitySpider.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/spider/EntitySpider.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityDrowned.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityDrowned.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityDrowned.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityDrowned.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityHusk.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityHusk.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityHusk.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityHusk.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombie.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombie.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombie.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombie.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombiePigman.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombiePigman.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombiePigman.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombiePigman.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombieVillager.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombieVillager.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombieVillager.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/hostile/zombie/EntityZombieVillager.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityPassive.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityPassive.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityPassive.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityPassive.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityVillager.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityVillager.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityVillager.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityVillager.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityWanderingTrader.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityWanderingTrader.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityWanderingTrader.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/EntityWanderingTrader.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAnimal.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAnimal.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAnimal.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAnimal.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAxolotl.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAxolotl.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAxolotl.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityAxolotl.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityBee.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityBee.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityBee.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityBee.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityChicken.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityChicken.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityChicken.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityChicken.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityFox.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityFox.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityFox.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityFox.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityGoat.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityGoat.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityGoat.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityGoat.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityHoglin.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityHoglin.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityHoglin.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityHoglin.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityOcelot.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityOcelot.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityOcelot.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityOcelot.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPanda.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPanda.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPanda.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPanda.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPig.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPig.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPig.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPig.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPolarBear.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPolarBear.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPolarBear.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityPolarBear.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityRabbit.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityRabbit.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityRabbit.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityRabbit.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntitySheep.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntitySheep.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntitySheep.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntitySheep.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityStrider.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityStrider.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityStrider.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityStrider.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityTurtle.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityTurtle.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityTurtle.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/EntityTurtle.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityCow.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityCow.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityCow.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityCow.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityMooshroom.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityMooshroom.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityMooshroom.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/cow/EntityMooshroom.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorse.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorse.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorse.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorse.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorseBase.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorseBase.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorseBase.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityHorseBase.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntitySkeletonHorse.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntitySkeletonHorse.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntitySkeletonHorse.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntitySkeletonHorse.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityZombieHorse.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityZombieHorse.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityZombieHorse.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/EntityZombieHorse.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkey.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkey.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkey.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkey.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityDonkey.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityDonkey.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityDonkey.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityDonkey.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityMule.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityMule.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityMule.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/EntityMule.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlama.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlama.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlama.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlama.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlama.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlama.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlama.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlama.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityCat.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityCat.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityCat.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityCat.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityTameable.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityTameable.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityTameable.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityTameable.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityWolf.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityWolf.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityWolf.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/EntityWolf.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityParrot.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityParrot.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityParrot.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityParrot.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameable.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameable.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameable.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameable.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityAbstractClientPlayer.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityAbstractClientPlayer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityAbstractClientPlayer.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityAbstractClientPlayer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityClientPlayer.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityClientPlayer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityClientPlayer.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityClientPlayer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityOtherClientPlayer.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityOtherClientPlayer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityOtherClientPlayer.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityOtherClientPlayer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityPlayer.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityPlayer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityPlayer.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityPlayer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityServerPlayer.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityServerPlayer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityServerPlayer.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/player/EntityServerPlayer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityDolphin.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityDolphin.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityDolphin.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityDolphin.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityWaterCreature.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityWaterCreature.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityWaterCreature.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/EntityWaterCreature.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityFish.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityFish.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityFish.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityFish.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityPufferfish.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityPufferfish.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityPufferfish.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/EntityPufferfish.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityCod.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityCod.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityCod.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityCod.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySalmon.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySalmon.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySalmon.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySalmon.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySchoolingFish.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySchoolingFish.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySchoolingFish.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntitySchoolingFish.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityTropicalFish.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityTropicalFish.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityTropicalFish.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/fish/schooling/EntityTropicalFish.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntityGlowSquid.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntityGlowSquid.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntityGlowSquid.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntityGlowSquid.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntitySquid.java b/core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntitySquid.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntitySquid.java rename to core/src/main/java/net/meshmc/mesh/api/entity/living/water/squid/EntitySquid.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/math/BlockPos.java b/core/src/main/java/net/meshmc/mesh/api/math/BlockPos.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/math/BlockPos.java rename to core/src/main/java/net/meshmc/mesh/api/math/BlockPos.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/math/Box.java b/core/src/main/java/net/meshmc/mesh/api/math/Box.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/math/Box.java rename to core/src/main/java/net/meshmc/mesh/api/math/Box.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec2f.java b/core/src/main/java/net/meshmc/mesh/api/math/Vec2f.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec2f.java rename to core/src/main/java/net/meshmc/mesh/api/math/Vec2f.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec3d.java b/core/src/main/java/net/meshmc/mesh/api/math/Vec3d.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec3d.java rename to core/src/main/java/net/meshmc/mesh/api/math/Vec3d.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec3f.java b/core/src/main/java/net/meshmc/mesh/api/math/Vec3f.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec3f.java rename to core/src/main/java/net/meshmc/mesh/api/math/Vec3f.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec3i.java b/core/src/main/java/net/meshmc/mesh/api/math/Vec3i.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/math/Vec3i.java rename to core/src/main/java/net/meshmc/mesh/api/math/Vec3i.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/ClientPlayNetworkConnection.java b/core/src/main/java/net/meshmc/mesh/api/network/ClientPlayNetworkConnection.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/ClientPlayNetworkConnection.java rename to core/src/main/java/net/meshmc/mesh/api/network/ClientPlayNetworkConnection.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/NetworkConnection.java b/core/src/main/java/net/meshmc/mesh/api/network/NetworkConnection.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/NetworkConnection.java rename to core/src/main/java/net/meshmc/mesh/api/network/NetworkConnection.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/Packet.java b/core/src/main/java/net/meshmc/mesh/api/network/Packet.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/Packet.java rename to core/src/main/java/net/meshmc/mesh/api/network/Packet.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/PacketListener.java b/core/src/main/java/net/meshmc/mesh/api/network/PacketListener.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/PacketListener.java rename to core/src/main/java/net/meshmc/mesh/api/network/PacketListener.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketChatMessage.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketChatMessage.java similarity index 96% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketChatMessage.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketChatMessage.java index 3d7813a..aaa70d4 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketChatMessage.java +++ b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketChatMessage.java @@ -13,7 +13,7 @@ static CPacketChatMessage create(String message) { } String getMessage(); - void setMessage(String message); +// void setMessage(String message); @Nullable @GameVersion.OnlyOn(value = GameVersion.v1_19, minimumVersion = true) diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketConfirmTeleport.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketConfirmTeleport.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketConfirmTeleport.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketConfirmTeleport.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketHandSwing.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketHandSwing.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketHandSwing.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketHandSwing.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketInput.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketInput.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketInput.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketInput.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMovePlayer.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMovePlayer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMovePlayer.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMovePlayer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMoveVehicle.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMoveVehicle.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMoveVehicle.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketMoveVehicle.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketSteerBoat.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketSteerBoat.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketSteerBoat.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketSteerBoat.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseBlock.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseBlock.java similarity index 90% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseBlock.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseBlock.java index 69775a7..9896bd2 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseBlock.java +++ b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseBlock.java @@ -15,8 +15,8 @@ * @author Makrennel 2022/02/09 */ public interface CPacketUseBlock extends Packet.Client { - static CPacketUseBlock createCPacketUseBlock(Hand hand, BlockPos blockPos, Facing facing, Vec3d vector, boolean insideBlock) { - return StaticPackets.createCPacketUseBlock(hand, blockPos, facing, vector, insideBlock); + static CPacketUseBlock createCPacketUseBlock(Hand hand, BlockPos blockPos, Facing facing, Vec3d vector, boolean insideBlock, int sequence) { + return StaticPackets.createCPacketUseBlock(hand, blockPos, facing, vector, insideBlock, sequence); } BlockPos getBlockPos(); diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseEntity.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseEntity.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseEntity.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseEntity.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseItem.java b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseItem.java similarity index 74% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseItem.java rename to core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseItem.java index 5cf84db..a3fd66e 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseItem.java +++ b/core/src/main/java/net/meshmc/mesh/api/network/client/CPacketUseItem.java @@ -9,8 +9,8 @@ * @author Makrennel 2022/02/09 */ public interface CPacketUseItem extends Packet.Client { - static CPacketUseItem create(Hand hand) { - return StaticPackets.createCPacketUseItem(hand); + static CPacketUseItem create(Hand hand, int sequence) { + return StaticPackets.createCPacketUseItem(hand, sequence); } Hand getHand(); diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketAdvancementUpdate.java b/core/src/main/java/net/meshmc/mesh/api/network/server/SPacketAdvancementUpdate.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketAdvancementUpdate.java rename to core/src/main/java/net/meshmc/mesh/api/network/server/SPacketAdvancementUpdate.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockAction.java b/core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockAction.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockAction.java rename to core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockAction.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockUpdate.java b/core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockUpdate.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockUpdate.java rename to core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBlockUpdate.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBreakProgress.java b/core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBreakProgress.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBreakProgress.java rename to core/src/main/java/net/meshmc/mesh/api/network/server/SPacketBreakProgress.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketPlayerPositionRotation.java b/core/src/main/java/net/meshmc/mesh/api/network/server/SPacketPlayerPositionRotation.java similarity index 79% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketPlayerPositionRotation.java rename to core/src/main/java/net/meshmc/mesh/api/network/server/SPacketPlayerPositionRotation.java index fd03105..cc5891f 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketPlayerPositionRotation.java +++ b/core/src/main/java/net/meshmc/mesh/api/network/server/SPacketPlayerPositionRotation.java @@ -42,8 +42,8 @@ enum Flag { void removeFlag(Flag flag); @Nullable - @GameVersion.OnlyOn(value = GameVersion.v1_17, minimumVersion = true) + @GameVersion.OnlyOn(value = {GameVersion.v1_17, GameVersion.v1_17_1, GameVersion.v1_18, GameVersion.v1_18_1, GameVersion.v1_18_2}) Boolean getShouldDismount(); - @GameVersion.OnlyOn(value = GameVersion.v1_17, minimumVersion = true) + @GameVersion.OnlyOn(value = {GameVersion.v1_17, GameVersion.v1_17_1, GameVersion.v1_18, GameVersion.v1_18_1, GameVersion.v1_18_2}) void setShouldDismount(boolean value); } diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketTileEntityUpdate.java b/core/src/main/java/net/meshmc/mesh/api/network/server/SPacketTileEntityUpdate.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/network/server/SPacketTileEntityUpdate.java rename to core/src/main/java/net/meshmc/mesh/api/network/server/SPacketTileEntityUpdate.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/Camera.java b/core/src/main/java/net/meshmc/mesh/api/render/Camera.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/Camera.java rename to core/src/main/java/net/meshmc/mesh/api/render/Camera.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/RenderState.java b/core/src/main/java/net/meshmc/mesh/api/render/RenderState.java similarity index 94% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/RenderState.java rename to core/src/main/java/net/meshmc/mesh/api/render/RenderState.java index 8f88a4d..f9cf282 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/render/RenderState.java +++ b/core/src/main/java/net/meshmc/mesh/api/render/RenderState.java @@ -29,5 +29,5 @@ public interface RenderState { RenderState scissor(boolean state); - RenderState texture(boolean state); +// RenderState texture(boolean state); } diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/Renderer.java b/core/src/main/java/net/meshmc/mesh/api/render/Renderer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/Renderer.java rename to core/src/main/java/net/meshmc/mesh/api/render/Renderer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/Screen.java b/core/src/main/java/net/meshmc/mesh/api/render/Screen.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/Screen.java rename to core/src/main/java/net/meshmc/mesh/api/render/Screen.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/ScreenContext.java b/core/src/main/java/net/meshmc/mesh/api/render/ScreenContext.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/ScreenContext.java rename to core/src/main/java/net/meshmc/mesh/api/render/ScreenContext.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/TextRenderer.java b/core/src/main/java/net/meshmc/mesh/api/render/TextRenderer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/TextRenderer.java rename to core/src/main/java/net/meshmc/mesh/api/render/TextRenderer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferBuilder.java b/core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferBuilder.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferBuilder.java rename to core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferBuilder.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferRenderer.java b/core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferRenderer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferRenderer.java rename to core/src/main/java/net/meshmc/mesh/api/render/buffer/BufferRenderer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/Framebuffer.java b/core/src/main/java/net/meshmc/mesh/api/render/buffer/Framebuffer.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/Framebuffer.java rename to core/src/main/java/net/meshmc/mesh/api/render/buffer/Framebuffer.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/MatrixStack.java b/core/src/main/java/net/meshmc/mesh/api/render/buffer/MatrixStack.java similarity index 83% rename from mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/MatrixStack.java rename to core/src/main/java/net/meshmc/mesh/api/render/buffer/MatrixStack.java index b5b45be..5fdfb1f 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/api/render/buffer/MatrixStack.java +++ b/core/src/main/java/net/meshmc/mesh/api/render/buffer/MatrixStack.java @@ -1,8 +1,7 @@ package net.meshmc.mesh.api.render.buffer; import net.meshmc.mesh.api.render.Camera; - -import java.nio.FloatBuffer; +import org.joml.Matrix4f; /** * Provides an interface for manipulating the opengl matrix stack @@ -19,9 +18,9 @@ public interface MatrixStack { void rotate(float angle, float x, float y, float z); - FloatBuffer getProjectionMatrix(); + Matrix4f getProjectionMatrix(); - FloatBuffer getModelMatrix(); + Matrix4f getModelMatrix(); default void translate(Camera camera) { translate(-camera.getX(), -camera.getY(), -camera.getZ()); diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/util/Keyboard.java b/core/src/main/java/net/meshmc/mesh/api/util/Keyboard.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/util/Keyboard.java rename to core/src/main/java/net/meshmc/mesh/api/util/Keyboard.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/util/LocationIdentifier.java b/core/src/main/java/net/meshmc/mesh/api/util/LocationIdentifier.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/util/LocationIdentifier.java rename to core/src/main/java/net/meshmc/mesh/api/util/LocationIdentifier.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/util/Profiler.java b/core/src/main/java/net/meshmc/mesh/api/util/Profiler.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/util/Profiler.java rename to core/src/main/java/net/meshmc/mesh/api/util/Profiler.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/util/Utilities.java b/core/src/main/java/net/meshmc/mesh/api/util/Utilities.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/util/Utilities.java rename to core/src/main/java/net/meshmc/mesh/api/util/Utilities.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/world/ClientWorld.java b/core/src/main/java/net/meshmc/mesh/api/world/ClientWorld.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/world/ClientWorld.java rename to core/src/main/java/net/meshmc/mesh/api/world/ClientWorld.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/api/world/World.java b/core/src/main/java/net/meshmc/mesh/api/world/World.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/api/world/World.java rename to core/src/main/java/net/meshmc/mesh/api/world/World.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/MeshEvent.java b/core/src/main/java/net/meshmc/mesh/event/MeshEvent.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/event/MeshEvent.java rename to core/src/main/java/net/meshmc/mesh/event/MeshEvent.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/MeshEventManager.java b/core/src/main/java/net/meshmc/mesh/event/MeshEventManager.java similarity index 77% rename from mesh-core/src/main/java/net/meshmc/mesh/event/MeshEventManager.java rename to core/src/main/java/net/meshmc/mesh/event/MeshEventManager.java index 8b4f185..a683183 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/event/MeshEventManager.java +++ b/core/src/main/java/net/meshmc/mesh/event/MeshEventManager.java @@ -1,7 +1,7 @@ package net.meshmc.mesh.event; import dev.tigr.simpleevents.EventManager; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.api.util.Profiler; /** @@ -9,17 +9,11 @@ * @author Tigermouthbear 1/10/22 */ public class MeshEventManager extends EventManager { - private final Mesh mesh; - - public MeshEventManager(Mesh mesh) { - this.mesh = mesh; - } - @Override public T post(T event) { if(event instanceof MeshEvent) { MeshEvent meshEvent = (MeshEvent) event; - Profiler profiler = mesh.getMinecraft().getProfiler(); + Profiler profiler = MeshAPI.getMinecraft().getProfiler(); profiler.pushSection("mesh_" + meshEvent.getName() + (meshEvent.getEra() != null ? "_" + meshEvent.getEra().name().toLowerCase() : "")); T out = super.post(event); profiler.popSection(); diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/events/client/InputEvent.java b/core/src/main/java/net/meshmc/mesh/event/events/client/InputEvent.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/event/events/client/InputEvent.java rename to core/src/main/java/net/meshmc/mesh/event/events/client/InputEvent.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/events/client/ScreenOpenedEvent.java b/core/src/main/java/net/meshmc/mesh/event/events/client/ScreenOpenedEvent.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/event/events/client/ScreenOpenedEvent.java rename to core/src/main/java/net/meshmc/mesh/event/events/client/ScreenOpenedEvent.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/events/client/TickEvent.java b/core/src/main/java/net/meshmc/mesh/event/events/client/TickEvent.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/event/events/client/TickEvent.java rename to core/src/main/java/net/meshmc/mesh/event/events/client/TickEvent.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/events/entity/EntityEvent.java b/core/src/main/java/net/meshmc/mesh/event/events/entity/EntityEvent.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/event/events/entity/EntityEvent.java rename to core/src/main/java/net/meshmc/mesh/event/events/entity/EntityEvent.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/events/network/NetworkConnectionEvent.java b/core/src/main/java/net/meshmc/mesh/event/events/network/NetworkConnectionEvent.java similarity index 70% rename from mesh-core/src/main/java/net/meshmc/mesh/event/events/network/NetworkConnectionEvent.java rename to core/src/main/java/net/meshmc/mesh/event/events/network/NetworkConnectionEvent.java index 7b82d3e..4938b9c 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/event/events/network/NetworkConnectionEvent.java +++ b/core/src/main/java/net/meshmc/mesh/event/events/network/NetworkConnectionEvent.java @@ -1,11 +1,8 @@ package net.meshmc.mesh.event.events.network; import io.netty.channel.ChannelHandlerContext; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.GenericFutureListener; import net.meshmc.mesh.api.network.Packet; import net.meshmc.mesh.event.MeshEvent; -import org.jetbrains.annotations.Nullable; public class NetworkConnectionEvent extends MeshEvent { public NetworkConnectionEvent(String name, Era era) { @@ -25,13 +22,14 @@ public channelRead0(Era era, ChannelHandlerContext channelHandlerContext, Packet public static class sendPacket extends NetworkConnectionEvent { public final Packet packet; - @Nullable - public final GenericFutureListener> callback; + // TODO: 1.19.4 PacketCallback? +// @Nullable +// public final GenericFutureListener> callback; - public sendPacket(Era era, Packet packet, @Nullable GenericFutureListener> callback) { + public sendPacket(Era era, Packet packet) { super("sendPacket", era); this.packet = packet; - this.callback = callback; +// this.callback = callback; } } } diff --git a/mesh-core/src/main/java/net/meshmc/mesh/event/events/render/RenderEvent.java b/core/src/main/java/net/meshmc/mesh/event/events/render/RenderEvent.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/event/events/render/RenderEvent.java rename to core/src/main/java/net/meshmc/mesh/event/events/render/RenderEvent.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java b/core/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java rename to core/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java b/core/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java rename to core/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/statics/StaticPackets.java b/core/src/main/java/net/meshmc/mesh/statics/StaticPackets.java similarity index 98% rename from mesh-core/src/main/java/net/meshmc/mesh/statics/StaticPackets.java rename to core/src/main/java/net/meshmc/mesh/statics/StaticPackets.java index 35905ec..075d3f5 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/statics/StaticPackets.java +++ b/core/src/main/java/net/meshmc/mesh/statics/StaticPackets.java @@ -115,7 +115,7 @@ public static CPacketSteerBoat createCPacketSteerBoat(ByteBuf buf) { } // Use Block - public static CPacketUseBlock createCPacketUseBlock(Hand hand, BlockPos blockPos, Facing facing, Vec3d vector, boolean insideBlock) { + public static CPacketUseBlock createCPacketUseBlock(Hand hand, BlockPos blockPos, Facing facing, Vec3d vector, boolean insideBlock, int sequence) { throw new RuntimeException(); } @@ -141,7 +141,7 @@ public static CPacketUseEntity createCPacketUseEntity(ByteBuf buf) { } // Use Item - public static CPacketUseItem createCPacketUseItem(Hand hand) { + public static CPacketUseItem createCPacketUseItem(Hand hand, int sequence) { throw new RuntimeException(); } diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/GameVersion.java b/core/src/main/java/net/meshmc/mesh/util/GameVersion.java similarity index 71% rename from mesh-core/src/main/java/net/meshmc/mesh/util/GameVersion.java rename to core/src/main/java/net/meshmc/mesh/util/GameVersion.java index a4817e6..b340434 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/util/GameVersion.java +++ b/core/src/main/java/net/meshmc/mesh/util/GameVersion.java @@ -1,7 +1,5 @@ package net.meshmc.mesh.util; -import net.meshmc.mesh.Mesh; - import java.lang.annotation.ElementType; import java.lang.annotation.Target; @@ -10,13 +8,14 @@ * but the data is here... for whoever needs it. */ public enum GameVersion { + // TODO: newer versions v1_19_2("1.19.2", 760), v1_19_1("1.19.1", 760), v1_19("1.19", 759), - v1_18_2("1.18.2", 758, Mesh.LoaderType.FABRIC), - v1_18_1("1.18.1", 757, v1_18_2, Mesh.LoaderType.FABRIC), - v1_18("1.18", 757, v1_18_2, Mesh.LoaderType.FABRIC), + v1_18_2("1.18.2", 758), + v1_18_1("1.18.1", 757), + v1_18("1.18", 757), v1_17_1("1.17.1", 756), v1_17("1.17", 755), @@ -42,7 +41,7 @@ public enum GameVersion { v1_13_1("1.13.1", 401), v1_13("1.13", 393), - v1_12_2("1.12.2", 340, Mesh.LoaderType.FORGE), + v1_12_2("1.12.2", 340), v1_12_1("1.12.1", 338), v1_12("1.12", 335), @@ -128,34 +127,10 @@ public enum Loader { public final String versionString; public final int procotol; - /** - * The loaders that mesh supports on the game version - */ - public final Mesh.LoaderType[] compatibleLoaders; - /** - * The version of the loader the game version is compatible with running on - */ - public final GameVersion compatibleLoaderVersion; - - GameVersion(String versionString, int procotol, GameVersion compatibleLoaderVersion, Mesh.LoaderType... compatibleLoaders) { - this.versionString = versionString; - this.procotol = procotol; - this.compatibleLoaderVersion = compatibleLoaderVersion; - this.compatibleLoaders = compatibleLoaders; - } - - GameVersion(String versionString, int procotol, Mesh.LoaderType... compatibleLoaders) { - this.versionString = versionString; - this.procotol = procotol; - this.compatibleLoaderVersion = this; - this.compatibleLoaders = compatibleLoaders; - } GameVersion(String versionString, int procotol) { this.versionString = versionString; this.procotol = procotol; - this.compatibleLoaderVersion = null; - this.compatibleLoaders = new Mesh.LoaderType[] {}; } @Override diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/Keys.java b/core/src/main/java/net/meshmc/mesh/util/Keys.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/Keys.java rename to core/src/main/java/net/meshmc/mesh/util/Keys.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/block/BlockVariant.java b/core/src/main/java/net/meshmc/mesh/util/block/BlockVariant.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/block/BlockVariant.java rename to core/src/main/java/net/meshmc/mesh/util/block/BlockVariant.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/block/PistonPushReaction.java b/core/src/main/java/net/meshmc/mesh/util/block/PistonPushReaction.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/block/PistonPushReaction.java rename to core/src/main/java/net/meshmc/mesh/util/block/PistonPushReaction.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/collections/CollectionWrapper.java b/core/src/main/java/net/meshmc/mesh/util/collections/CollectionWrapper.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/collections/CollectionWrapper.java rename to core/src/main/java/net/meshmc/mesh/util/collections/CollectionWrapper.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/collections/IterableWrapper.java b/core/src/main/java/net/meshmc/mesh/util/collections/IterableWrapper.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/collections/IterableWrapper.java rename to core/src/main/java/net/meshmc/mesh/util/collections/IterableWrapper.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/collections/IteratorWrapper.java b/core/src/main/java/net/meshmc/mesh/util/collections/IteratorWrapper.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/collections/IteratorWrapper.java rename to core/src/main/java/net/meshmc/mesh/util/collections/IteratorWrapper.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/collections/MapWrapper.java b/core/src/main/java/net/meshmc/mesh/util/collections/MapWrapper.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/collections/MapWrapper.java rename to core/src/main/java/net/meshmc/mesh/util/collections/MapWrapper.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/collections/SetWrapper.java b/core/src/main/java/net/meshmc/mesh/util/collections/SetWrapper.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/collections/SetWrapper.java rename to core/src/main/java/net/meshmc/mesh/util/collections/SetWrapper.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/entity/ActionResult.java b/core/src/main/java/net/meshmc/mesh/util/entity/ActionResult.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/entity/ActionResult.java rename to core/src/main/java/net/meshmc/mesh/util/entity/ActionResult.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/entity/Arm.java b/core/src/main/java/net/meshmc/mesh/util/entity/Arm.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/entity/Arm.java rename to core/src/main/java/net/meshmc/mesh/util/entity/Arm.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/entity/Stance.java b/core/src/main/java/net/meshmc/mesh/util/entity/Stance.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/entity/Stance.java rename to core/src/main/java/net/meshmc/mesh/util/entity/Stance.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/item/DyeColor.java b/core/src/main/java/net/meshmc/mesh/util/item/DyeColor.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/item/DyeColor.java rename to core/src/main/java/net/meshmc/mesh/util/item/DyeColor.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/math/Facing.java b/core/src/main/java/net/meshmc/mesh/util/math/Facing.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/math/Facing.java rename to core/src/main/java/net/meshmc/mesh/util/math/Facing.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/math/Hand.java b/core/src/main/java/net/meshmc/mesh/util/math/Hand.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/math/Hand.java rename to core/src/main/java/net/meshmc/mesh/util/math/Hand.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/math/MathHelper.java b/core/src/main/java/net/meshmc/mesh/util/math/MathHelper.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/math/MathHelper.java rename to core/src/main/java/net/meshmc/mesh/util/math/MathHelper.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/network/ByteBufUtil.java b/core/src/main/java/net/meshmc/mesh/util/network/ByteBufUtil.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/network/ByteBufUtil.java rename to core/src/main/java/net/meshmc/mesh/util/network/ByteBufUtil.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/network/NetworkDirection.java b/core/src/main/java/net/meshmc/mesh/util/network/NetworkDirection.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/network/NetworkDirection.java rename to core/src/main/java/net/meshmc/mesh/util/network/NetworkDirection.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/network/NetworkState.java b/core/src/main/java/net/meshmc/mesh/util/network/NetworkState.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/network/NetworkState.java rename to core/src/main/java/net/meshmc/mesh/util/network/NetworkState.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/render/Color.java b/core/src/main/java/net/meshmc/mesh/util/render/Color.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/render/Color.java rename to core/src/main/java/net/meshmc/mesh/util/render/Color.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/render/GlState.java b/core/src/main/java/net/meshmc/mesh/util/render/GlState.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/render/GlState.java rename to core/src/main/java/net/meshmc/mesh/util/render/GlState.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/render/LineHelper.java b/core/src/main/java/net/meshmc/mesh/util/render/LineHelper.java similarity index 97% rename from mesh-core/src/main/java/net/meshmc/mesh/util/render/LineHelper.java rename to core/src/main/java/net/meshmc/mesh/util/render/LineHelper.java index f4b49d7..691c6d5 100644 --- a/mesh-core/src/main/java/net/meshmc/mesh/util/render/LineHelper.java +++ b/core/src/main/java/net/meshmc/mesh/util/render/LineHelper.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.util.render; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.api.render.buffer.BufferBuilder; import net.meshmc.mesh.api.render.Renderer; @@ -25,7 +25,7 @@ public static void populateTriangleBuffer(BufferBuilder bufferBuilder, Vertex } public static void drawTriangulatedLines(Vertex[]... lines) { - BufferBuilder buffer = Mesh.getMesh().getRenderer().getBufferBuilder(); + BufferBuilder buffer = MeshAPI.getRenderer().getBufferBuilder(); buffer.begin(Renderer.DrawMode.TRIANGLES, Renderer.VertexFormat.POSITION_COLOR); for(Vertex[] line: lines) { diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/render/Resolution.java b/core/src/main/java/net/meshmc/mesh/util/render/Resolution.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/render/Resolution.java rename to core/src/main/java/net/meshmc/mesh/util/render/Resolution.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/render/TextColor.java b/core/src/main/java/net/meshmc/mesh/util/render/TextColor.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/render/TextColor.java rename to core/src/main/java/net/meshmc/mesh/util/render/TextColor.java diff --git a/mesh-core/src/main/java/net/meshmc/mesh/util/render/Vertex.java b/core/src/main/java/net/meshmc/mesh/util/render/Vertex.java similarity index 100% rename from mesh-core/src/main/java/net/meshmc/mesh/util/render/Vertex.java rename to core/src/main/java/net/meshmc/mesh/util/render/Vertex.java diff --git a/core/src/main/resources/meshapi.mesh.json b/core/src/main/resources/meshapi.mesh.json new file mode 100644 index 0000000..1e0ae04 --- /dev/null +++ b/core/src/main/resources/meshapi.mesh.json @@ -0,0 +1,20 @@ +{ + "id": "meshapi", + "name": "MeshAPI", + "version": "${version}", + "description": "An API for mods using the Mesh Loader.", + "website": "https://meshmc.net/", + "authors": [ + "Makrennel", + "Tigermouthbear" + ], + "initializers": [ + "net.meshmc.mesh.MeshAPI" + ], + "interfaces": [ + "net.meshmc.mesh.impl" + ], + "mixins": [ + "mesh.mixins.json" + ] +} \ No newline at end of file diff --git a/fabric.gradle b/fabric.gradle new file mode 100644 index 0000000..ac2f624 --- /dev/null +++ b/fabric.gradle @@ -0,0 +1,32 @@ +plugins { + id "fabric-loom" version '1.3-SNAPSHOT' +} + +group = project.mavenGroup +version = project.modVersion +archivesBaseName = project.modid + "-" + project.name + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraftVersion}" + mappings "net.fabricmc:yarn:${project.yarnMappings}" + modImplementation "net.fabricmc:fabric-loader:${project.fabricLoaderVersion}" + + implementation project(":core") +} + +loom { + accessWidenerPath = file("src/main/resources/mesh.accesswidener") +} + +tasks.withType(JavaCompile) { + options.release.set(17) + options.encoding = "UTF-8" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 75a14cd..5a4a5b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,9 @@ -meshVersion=1.0-SNAPSHOT +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G -kotlinVersion = 1.6.10 -coroutinesVersion = 1.6.0 -serializationVersion = 1.3.2 +# Mod Properties +modVersion=1.0-SNAPSHOT +mavenGroup=net.meshmc +modid=mesh-api + +loaderVersion=1.0-SNAPSHOT \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..15de902 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mesh-core/build.gradle b/mesh-core/build.gradle deleted file mode 100644 index 865ede4..0000000 --- a/mesh-core/build.gradle +++ /dev/null @@ -1,63 +0,0 @@ -compileJava { - sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 - options.encoding = "UTF-8" -} - -configurations { - embeddedLibs -} - -dependencies { - implementation "org.apache.logging.log4j:log4j-api:2.17.2" - implementation "com.google.code.gson:gson:2.9.0" - implementation "com.mojang:authlib:1.5.21" - implementation "io.netty:netty-all:4.1.77.Final" - - embeddedLibs "dev.tigr:simpleevents:1.3" - - embeddedLibs("org.reflections:reflections:0.10.2") { - exclude module: "gson" - exclude module: "guava" - exclude module: "slf4j-api" - } - - implementation configurations.embeddedLibs - - embeddedLibs("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") - embeddedLibs("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion") - embeddedLibs("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion") - embeddedLibs("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") - embeddedLibs("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - embeddedLibs("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$coroutinesVersion") - embeddedLibs("org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:$serializationVersion") - embeddedLibs("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:$serializationVersion") - embeddedLibs("org.jetbrains.kotlinx:kotlinx-serialization-cbor-jvm:$serializationVersion") -} - -jar { - from { - duplicatesStrategy = DuplicatesStrategy.INCLUDE - configurations.embeddedLibs.collect { - it.isDirectory() ? it : zipTree(it) - } - } - archiveClassifier.set("all") - - exclude "net/meshmc/mesh/MeshStatics.class", "net/meshmc/mesh/statics/**", - "META-INF/maven", "META-INF/maven/**", - "META-INF/versions", "META-INF/versions/**", "META-INF/proguard", "META-INF/proguard/**", - "META-INF/com.android.tools", "META-INF/com.android.tools/**", "DebugProbesKt.bin" -} - -task sourceJar(type: Jar) { - from(sourceSets.main.java) - archiveClassifier.set("sources") - exclude "net/meshmc/mesh/MeshStatics.class", "net/meshmc/mesh/statics/**" -} -build.dependsOn("sourceJar") - -task coreJar(type: Jar) { - from(sourceSets.main.output) - exclude "net/meshmc/mesh/MeshStatics.class", "net/meshmc/mesh/statics/**" -} -build.dependsOn("coreJar") \ No newline at end of file diff --git a/mesh-core/src/main/java/net/meshmc/mesh/Mesh.java b/mesh-core/src/main/java/net/meshmc/mesh/Mesh.java deleted file mode 100644 index 0c171c8..0000000 --- a/mesh-core/src/main/java/net/meshmc/mesh/Mesh.java +++ /dev/null @@ -1,383 +0,0 @@ -package net.meshmc.mesh; - -import com.google.gson.Gson; -import dev.tigr.simpleevents.EventManager; -import net.meshmc.mesh.api.client.Minecraft; -import net.meshmc.mesh.api.render.Renderer; -import net.meshmc.mesh.api.util.Utilities; -import net.meshmc.mesh.event.MeshEventManager; -import net.meshmc.mesh.util.GameVersion; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.reflections.Reflections; -import org.reflections.scanners.Scanners; -import org.reflections.util.ClasspathHelper; -import org.reflections.util.ConfigurationBuilder; - -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; - -/** - * The main Mesh class. This manages all APIs and version specific procedures. - * When making an interface for a new minecraft version, it must provide a class - * (net.meshmc.mesh.impl.MeshImpl) in the classpath to be loaded as the implementation. - * The constructor for this implementation must have no args because it is loaded - * at runtime. - * - * @author Tigermouthbear 1/1/22 - */ -public abstract class Mesh { - protected static final Logger MESH_LOGGER = LogManager.getLogger("Mesh"); - - /** - * The current implementation of Mesh, this is loaded from - * net.meshmc.mesh.impl.MeshImpl. If the class is not present, - * a runtime exception is thrown - */ - private static final Mesh INSTANCE; - static { - try { - INSTANCE = (Mesh) Class.forName("net.meshmc.mesh.impl.MeshImpl").getConstructor().newInstance(); - } catch(Exception e) { - throw new RuntimeException("Mesh failed to find implementation in classpath!"); - } - } - - /** - * Enum type for minecraft mods loader, impls must specify this so - * that users can check what loader minecraft is using - */ - public enum LoaderType { FORGE, FABRIC } - - public static class Mod { - /** - * the modid(unique identifier) of the represented Mesh mod - */ - private String id; - - /** - * the version of the represented Mesh mod - */ - private String version; - - /** - * the name of the represented Mesh mod - */ - private String name; - - /** - * the description of the represented Mesh mod - */ - private String description; - - /** - * a list of the authors of the mod - */ - private String[] authors; - - /** - * the website of the mod - */ - private String website; - - /** - * a list of {@link Initializer}s to be called on startup - */ - private String[] initializers; - - public String getId() { - return id; - } - - public String getVersion() { - return version; - } - - public String getName() { - return name; - } - - public String getDescription() { - return description; - } - - public String[] getAuthors() { - return authors; - } - - public String getWebsite() { - return website; - } - } - - /** - * Marks the method to be called from mesh on initialization - * This should be used by mods for initialization so that if the loading stage of mesh mods ever change, - * the initialization point will stay the same - */ - public interface Initializer { - void init(); - } - - private final LoaderType loaderType; - private final String loaderVersion; - private GameVersion gameVersion; - - // The event manager for mesh, all game, render, and client events are posted through this - private final EventManager eventManager = new MeshEventManager(this); - - // List of all Mesh mods that have been initialized - private final List mods = new ArrayList<>(); - - // Whether Mesh has loaded all its mods, check in loadMods() - private boolean loaded = false; - private boolean initialized = false; - - /** - * Creates a new implementation of the Mesh interface. This should only - * be called by the Mesh implementation subclasses. - * @param loaderType The loader that the implementation is running on. - * @param loaderVersion The version of the loader that the implementation is running. - */ - public Mesh(LoaderType loaderType, String loaderVersion) { - this.loaderType = loaderType; - this.loaderVersion = loaderVersion; - } - - /** - * Loads mesh mods into the classpath from .minecraft/mods/mesh and adds them to the mods list - * @param minecraftFolder minecraft's game directory - * @param classLoader the classloader to load into - */ - public static void load(File minecraftFolder, ClassLoader classLoader) { - long start = System.currentTimeMillis(); - - INSTANCE.loadMods(minecraftFolder, classLoader); - - MESH_LOGGER.info("Mesh for {} {} loaded {} mods in {} milliseconds!", - INSTANCE.loaderType.name().toLowerCase(), INSTANCE.loaderVersion, - INSTANCE.mods.size(), System.currentTimeMillis() - start); - } - - /** - * Scans for mesh mods in the classpath adds them to the mod list - */ - private void loadMods(File minecraftFolder, ClassLoader classLoader) { - if(loaded) return; - - // find mods folder - File modFolder = minecraftFolder.isDirectory() ? new File(minecraftFolder, "mods") : null; - - // find mesh folder - File meshFolder = minecraftFolder.isDirectory() ? new File(minecraftFolder, "mesh") : null; - - // find mesh folder in mods - File modMeshFolder = modFolder != null && modFolder.isDirectory() ? new File(modFolder, "mesh") : null; - - if((meshFolder == null || !meshFolder.isDirectory()) - && (modFolder == null || !modFolder.isDirectory()) - && (modMeshFolder == null || !modMeshFolder.isDirectory()) - ) { - loaded = true; - return; - } - - // find all mod files (.jar)s - File[] fromMesh = null, fromMods = null, fromModsMesh = null; - - if(meshFolder != null && meshFolder.isDirectory()) - fromMesh = meshFolder.listFiles(file -> file.getName().endsWith(".jar")); - - if(modFolder != null && modFolder.isDirectory()) - fromMods = modFolder.listFiles(file -> file.getName().endsWith(".jar")); - - if(modMeshFolder != null && modMeshFolder.isDirectory()) - fromModsMesh = modMeshFolder.listFiles(file -> file.getName().endsWith(".jar")); - - if((fromMesh == null || fromMesh.length == 0) - && (fromMods == null || fromMods.length == 0) - && (fromModsMesh == null || fromModsMesh.length == 0) - ) { - loaded = true; - return; - } - - // load mesh mods into classpath - try { - Method addURL; - - try { // loader v0.14.x - addURL = classLoader.getClass().getDeclaredMethod("addUrlFwd", URL.class); - } catch(Exception ignored) { // loader pre v0.14.x - if(classLoader instanceof URLClassLoader) addURL = URLClassLoader.class.getDeclaredMethod("addURL", URL.class); - else addURL = classLoader.getClass().getDeclaredMethod("addURL", URL.class); - } - - addURL.setAccessible(true); - - if(fromMesh != null && fromMesh.length != 0) - for(File modFile: fromMesh) - addURL.invoke(classLoader, modFile.toURI().toURL()); - - if(fromMods != null && fromMods.length != 0) - for(File modFile: fromMods) - addURL.invoke(classLoader, modFile.toURI().toURL()); - - if(fromModsMesh != null && fromModsMesh.length != 0) - for(File modFile: fromModsMesh) - addURL.invoke(classLoader, modFile.toURI().toURL()); - - } catch(Exception e) { - e.printStackTrace(); - } - - // find mesh mod jsons - Gson gson = new Gson(); - Reflections reflections = new Reflections(new ConfigurationBuilder() - .setUrls(ClasspathHelper.forClassLoader()) - .setScanners(Scanners.Resources) - ); - reflections.getResources(".*\\.mesh\\.json").forEach((resource) -> { - InputStream is = ClasspathHelper.contextClassLoader().getResourceAsStream(resource); - if(is == null) is = ClasspathHelper.staticClassLoader().getResourceAsStream(resource); - if(is != null) { - try { - mods.add(gson.fromJson(new InputStreamReader(is), Mod.class)); - } catch(Exception e) { - e.printStackTrace(); - } - } - }); - - loaded = true; - } - - // TODO: LOAD MIXINS DURING LOADMODS - - /** - * Calls the initialization method for all mesh mods, and mesh utilities - */ - public static void init(String gameVersion) { - if(!INSTANCE.loaded) - throw new RuntimeException("Mesh tried to initialize mods before loading them!"); - - INSTANCE.gameVersion = getGameVersion(gameVersion); - - long start = System.currentTimeMillis(); - - INSTANCE.initMods(); - - MESH_LOGGER.info("Mesh for {} {} initialized {} mods on Minecraft {} in {} milliseconds!", - INSTANCE.loaderType.name().toLowerCase(), INSTANCE.loaderVersion, - INSTANCE.mods.size(), INSTANCE.gameVersion, System.currentTimeMillis() - start); - - } - - /** - * Finds the equivalent enumerated GameVersion from String - * @param gameVersionString The string value of the GameVersion to find - * @return The equivalent GameVersion - */ - protected static GameVersion getGameVersion(String gameVersionString) { - for(GameVersion version: GameVersion.values()) - if(version.versionString.equals(gameVersionString)) - return version; - - throw new RuntimeException("Failed to determine the version of the game"); - } - - // call the initializers for each loaded mod - private void initMods() { - if(initialized) return; - - for(Mod mod: mods) { - for(String className: mod.initializers) { - Object initializer; - try { - initializer = Class.forName(className).getConstructor().newInstance(); - } catch(Exception e) { - throw new RuntimeException("Mesh failed to create initializer instance " + className); - } - - if(initializer instanceof Initializer) ((Initializer) initializer).init(); - else throw new RuntimeException("Mesh failed to call initializer " + className + " in mod " + mod.id); - } - } - - eventManager.register(INSTANCE.getUtilities()); - - initialized = true; - } - - /** - * Gets the minecraft mod loader Mesh is running on. - * @return {@link LoaderType} of the minecraft process Mesh is running on. - */ - public LoaderType getLoaderType() { - return loaderType; - } - - /** - * Gets the version of the mod load that Mesh is running on. - * @return A string representation of the current loader version. - */ - public String getLoaderVersion() { - return loaderVersion; - } - - /** - * Gets the version of the game that Mesh is running on. - * @return An enum value corresponding to the current game version. - */ - public GameVersion getGameVersion() { - return gameVersion; - } - - /** - * Gets the event manager for the Mesh interface - * @return {@link EventManager} that mesh is using to post game events - */ - public EventManager getEventManager() { - return eventManager; - } - - /** - * Gets a list of {@link Mod}s running under Mesh - * @return The list of running Mesh {@link Mod}s - */ - public List getMods() { - return mods; - } - - /** - * Gets the Mesh interface for Minecraft's main instance - * @return The current {@link Minecraft} instance - */ - public abstract Minecraft getMinecraft(); - - /** - * Gets the Mesh interface for rendering - * @return A {@link Renderer} for rendering - */ - public abstract Renderer getRenderer(); - - /** - * Gets the Mesh Utility interface - * @return {@link Utilities} - */ - public abstract Utilities getUtilities(); - - /** - * Gets the current implementation of Mesh - * @return The implementation fo Mesh minecraft is using - */ - public static Mesh getMesh() { - return INSTANCE; - } -} diff --git a/mesh-fabric-1.18.2/build.gradle b/mesh-fabric-1.18.2/build.gradle deleted file mode 100644 index 698748e..0000000 --- a/mesh-fabric-1.18.2/build.gradle +++ /dev/null @@ -1,63 +0,0 @@ -plugins { - id "fabric-loom" version "0.8-SNAPSHOT" -} - -tasks.withType(JavaCompile) { - options.release.set(17) - options.encoding = "UTF-8" -} - -configurations { - coreLibs -} - -dependencies { - minecraft "com.mojang:minecraft:1.18.2" - mappings "net.fabricmc:yarn:1.18.2+build.1:v2" - modImplementation "net.fabricmc:fabric-loader:0.14.2" - - implementation "dev.tigr:simpleevents:1.3" - - coreLibs(project(":mesh-core")) { - exclude module: "log4j-api" - exclude module: "gson" - exclude module: "guava" - exclude module: "authlib" - } - - implementation configurations.coreLibs -} - -loom { - accessWidener = file("src/main/resources/mesh.accesswidener") -} - -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -task standaloneJar(type: Jar) { - from { - tasks.remapJar.outputs.collect { - it.files.collect { - it.isDirectory() ? it : zipTree(it) - } - } - } - from { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - configurations.coreLibs.collect { - it.isDirectory() ? it : zipTree(it) - } - } - archiveClassifier.set("standalone") - - exclude "META-INF/maven", "META-INF/maven/**", "META-INF/versions", "META-INF/versions/**" , - "META-INF/proguard", "META-INF/proguard/**", "META-INF/com.android.tools", - "META-INF/com.android.tools/**", "DebugProbesKt.bin" -} -build.dependsOn("standaloneJar") diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/MeshImpl.java b/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/MeshImpl.java deleted file mode 100644 index ca3b6af..0000000 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/MeshImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.meshmc.mesh.impl; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint; -import net.fabricmc.loader.impl.FabricLoaderImpl; -import net.fabricmc.loader.impl.launch.FabricLauncherBase; -import net.meshmc.mesh.Mesh; -import net.meshmc.mesh.api.client.Minecraft; -import net.meshmc.mesh.api.render.Renderer; -import net.meshmc.mesh.api.util.Utilities; -import net.meshmc.mesh.impl.wrapper.render.RendererMesh; -import net.meshmc.mesh.impl.wrapper.util.UtilitiesMesh; -import net.minecraft.client.MinecraftClient; - -/** - * Implementation of Mesh for Fabric 1.18.2 - * - * @author Tigermouthbear 1/1/22 - */ -public class MeshImpl extends Mesh implements ModInitializer, PreLaunchEntrypoint { - private static Minecraft MINECRAFT; - private static RendererMesh RENDERER; - private static UtilitiesMesh UTILITIES; - - public MeshImpl() { - super(LoaderType.FABRIC, "1.18.2"); - } - - @Override - public void onPreLaunch() { - Mesh.load(FabricLoaderImpl.INSTANCE.getGameDir().toFile(), FabricLauncherBase.getLauncher().getTargetClassLoader()); - } - - @Override - public void onInitialize() { - MINECRAFT = (Minecraft) MinecraftClient.getInstance(); - RENDERER = new RendererMesh(); - UTILITIES = new UtilitiesMesh(); - - Mesh.init(MinecraftClient.getInstance().getGameVersion()); - } - - @Override - public Minecraft getMinecraft() { - return MINECRAFT; - } - - @Override - public Renderer getRenderer() { - return RENDERER; - } - - @Override - public Utilities getUtilities() { - return UTILITIES; - } -} diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferRendererAccessor.java b/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferRendererAccessor.java deleted file mode 100644 index f0e2273..0000000 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferRendererAccessor.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.meshmc.mesh.impl.mixin.accessors.render; - -import net.minecraft.client.render.BufferRenderer; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(BufferRenderer.class) -public interface BufferRendererAccessor { - @Accessor("currentVertexArray") - static int getCurrentVertexArray() { - throw new AssertionError(); - } - - @Accessor("currentVertexArray") - static void setCurrentVertexArray(int vao) { - throw new AssertionError(); - } - - @Accessor("currentVertexBuffer") - static int getCurrentVertexBuffer() { - throw new AssertionError(); - } - - @Accessor("currentVertexBuffer") - static void setCurrentVertexBuffer(int vbo) { - throw new AssertionError(); - } - - @Accessor("currentElementBuffer") - static int getCurrentElementBuffer() { - throw new AssertionError(); - } - - @Accessor("currentElementBuffer") - static void setCurrentElementBuffer(int ibo) { - throw new AssertionError(); - } -} diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferRendererMesh.java b/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferRendererMesh.java deleted file mode 100644 index e842c2e..0000000 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferRendererMesh.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.meshmc.mesh.impl.wrapper.render; - -import net.meshmc.mesh.api.render.buffer.BufferRenderer; -import net.meshmc.mesh.impl.mixin.accessors.render.BufferRendererAccessor; - -public class BufferRendererMesh implements BufferRenderer { - @Override - public int getVertexArray() { - return BufferRendererAccessor.getCurrentVertexArray(); - } - - @Override - public void setVertexArray(int vao) { - BufferRendererAccessor.setCurrentVertexArray(vao); - } - - @Override - public int getVertexBuffer() { - return BufferRendererAccessor.getCurrentVertexBuffer(); - } - - @Override - public void setVertexBuffer(int vbo) { - BufferRendererAccessor.setCurrentVertexBuffer(vbo); - } - - @Override - public int getElementBuffer() { - return BufferRendererAccessor.getCurrentElementBuffer(); - } - - @Override - public void setElementBuffer(int ibo) { - BufferRendererAccessor.setCurrentElementBuffer(ibo); - } -} diff --git a/mesh-fabric-1.18.2/src/main/resources/fabric.mod.json b/mesh-fabric-1.18.2/src/main/resources/fabric.mod.json deleted file mode 100644 index 495a462..0000000 --- a/mesh-fabric-1.18.2/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "schemaVersion": 1, - "id": "mesh", - "version": "${version}", - - "name": "Mesh", - "description": "Mesh is a cross-version minecraft mod platform", - "authors": [ - "Tigermouthbear", - "Makrennel" - ], - "contact": { - "homepage": "https://meshmc.net/" - }, - "environment": "*", - "entrypoints": { - "main": [ - "net.meshmc.mesh.impl.MeshImpl" - ], - "preLaunch": [ - "net.meshmc.mesh.impl.MeshImpl" - ] - }, - "mixins": [ - "mesh.mixins.json" - ], - "accessWidener": "mesh.accesswidener", - "suggests": { - "flamingo": "*" - } -} diff --git a/settings.gradle b/settings.gradle index 569ca8d..d1b7134 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { rootProject.name = "mesh" -include "mesh-core" -include "mesh-loader" -include "mesh-forge-1.12.2" -include "mesh-fabric-1.18.2" +include "core" +//include "mesh-loader" +include "version:v1_19_4" +//include "version:v1_12_2" diff --git a/mesh-forge-1.12.2/build.gradle b/version/v1_12_2/build.gradle similarity index 98% rename from mesh-forge-1.12.2/build.gradle rename to version/v1_12_2/build.gradle index 20894d7..b6c7c09 100644 --- a/mesh-forge-1.12.2/build.gradle +++ b/version/v1_12_2/build.gradle @@ -1,3 +1,4 @@ +// TODO: buildscript { repositories { gradlePluginPortal() @@ -39,7 +40,7 @@ dependencies { implementation "dev.tigr:simpleevents:1.3" - coreLibs(project(":mesh-core")) { + coreLibs(project(":core")) { exclude module: "log4j-api" exclude module: "gson" exclude module: "guava" diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/MeshStatics.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/MeshStatics.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/MeshStatics.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/MeshStatics.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/ForgeEvents.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/ForgeEvents.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/ForgeEvents.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/ForgeEvents.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/MeshImpl.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/MeshImpl.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/MeshImpl.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/MeshImpl.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/MixinLoader.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/MixinLoader.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/MixinLoader.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/MixinLoader.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/NetworkManagerAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/NetworkManagerAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/NetworkManagerAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/NetworkManagerAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketAnimationAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketAnimationAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketAnimationAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketAnimationAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketChatMessageAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketChatMessageAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketChatMessageAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketChatMessageAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketConfirmTeleportAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketConfirmTeleportAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketConfirmTeleportAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketConfirmTeleportAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketInputAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketInputAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketInputAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketInputAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemOnBlockAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemOnBlockAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemOnBlockAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketPlayerTryUseItemOnBlockAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketSteerBoatAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketSteerBoatAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketSteerBoatAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketSteerBoatAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketUseEntityAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketUseEntityAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketUseEntityAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketUseEntityAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketVehicleMoveAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketVehicleMoveAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketVehicleMoveAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/CPacketVehicleMoveAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockBreakAnimAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockBreakAnimAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockBreakAnimAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockBreakAnimAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockChangeAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockChangeAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockChangeAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketBlockChangeAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketPlayerPosLookAccessor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketPlayerPosLookAccessor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketPlayerPosLookAccessor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/SPacketPlayerPosLookAccessor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockFenceGate.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockFenceGate.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockFenceGate.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockFenceGate.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockGlazedTerracotta.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockGlazedTerracotta.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockGlazedTerracotta.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinBlockGlazedTerracotta.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraft.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraft.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraft.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraft.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntityPlayerSP.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntityPlayerSP.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntityPlayerSP.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntityPlayerSP.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGuiIngame.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGuiIngame.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGuiIngame.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGuiIngame.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinWorld.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinWorld.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinWorld.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinWorld.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnection.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnection.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnection.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnection.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinGuiScreen.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinGuiScreen.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinGuiScreen.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinGuiScreen.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/tweaker/MeshTweaker.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/tweaker/MeshTweaker.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/tweaker/MeshTweaker.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/tweaker/MeshTweaker.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/Mappings.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/Mappings.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/Mappings.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/Mappings.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockFenceGateDuck.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockFenceGateDuck.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockFenceGateDuck.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockFenceGateDuck.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockGlazedTerracottaDuck.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockGlazedTerracottaDuck.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockGlazedTerracottaDuck.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/duck/BlockGlazedTerracottaDuck.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/duck/NetworkConnectionDuck.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/duck/NetworkConnectionDuck.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/util/duck/NetworkConnectionDuck.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/util/duck/NetworkConnectionDuck.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/statics/StaticPackets.java b/version/v1_12_2/src/main/java/net/meshmc/mesh/statics/StaticPackets.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/statics/StaticPackets.java rename to version/v1_12_2/src/main/java/net/meshmc/mesh/statics/StaticPackets.java diff --git a/mesh-forge-1.12.2/src/main/resources/META-INF/accesstransformer.cfg b/version/v1_12_2/src/main/resources/META-INF/accesstransformer.cfg similarity index 100% rename from mesh-forge-1.12.2/src/main/resources/META-INF/accesstransformer.cfg rename to version/v1_12_2/src/main/resources/META-INF/accesstransformer.cfg diff --git a/mesh-forge-1.12.2/src/main/resources/mcmod.info b/version/v1_12_2/src/main/resources/mcmod.info similarity index 100% rename from mesh-forge-1.12.2/src/main/resources/mcmod.info rename to version/v1_12_2/src/main/resources/mcmod.info diff --git a/mesh-forge-1.12.2/src/main/resources/mesh.mixins.json b/version/v1_12_2/src/main/resources/mesh.mixins.json similarity index 100% rename from mesh-forge-1.12.2/src/main/resources/mesh.mixins.json rename to version/v1_12_2/src/main/resources/mesh.mixins.json diff --git a/version/v1_19_4/build.gradle b/version/v1_19_4/build.gradle new file mode 120000 index 0000000..dfdc7b3 --- /dev/null +++ b/version/v1_19_4/build.gradle @@ -0,0 +1 @@ +../../fabric.gradle \ No newline at end of file diff --git a/version/v1_19_4/gradle.properties b/version/v1_19_4/gradle.properties new file mode 100644 index 0000000..0c6ea69 --- /dev/null +++ b/version/v1_19_4/gradle.properties @@ -0,0 +1,3 @@ +minecraftVersion=1.19.4 +yarnMappings=1.19.4+build.2 +fabricLoaderVersion=0.14.22 \ No newline at end of file diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/MeshStatics.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/MeshStatics.java similarity index 98% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/MeshStatics.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/MeshStatics.java index 1bc5978..fab8add 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/MeshStatics.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/MeshStatics.java @@ -17,6 +17,7 @@ import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.realms.gui.screen.RealmsMainScreen; import net.minecraft.util.Identifier; +import org.joml.Vector3f; /** * @author Tigermouthbear 1/10/22 @@ -40,7 +41,7 @@ public static Vec3d createVec3d(double x, double y, double z) { } public static Vec3f createVec3f(float x, float y, float z) { - return (Vec3f) new net.minecraft.util.math.Vec3f(x, y, z); + return (Vec3f) new Vector3f(x, y, z); } public static Vec3i createVec3i(int x, int y, int z) { diff --git a/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/Mesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/Mesh.java new file mode 100644 index 0000000..4bb8610 --- /dev/null +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/Mesh.java @@ -0,0 +1,28 @@ +package net.meshmc.mesh.impl; + +import net.meshmc.mesh.IMesh; +import net.meshmc.mesh.api.client.Minecraft; +import net.meshmc.mesh.api.render.Renderer; +import net.meshmc.mesh.api.util.Utilities; +import net.meshmc.mesh.impl.wrapper.render.RendererMesh; +import net.meshmc.mesh.impl.wrapper.util.UtilitiesMesh; +import net.meshmc.mesh.loader.Mod; +import net.minecraft.client.MinecraftClient; + +@Mod.Interface +public class Mesh implements IMesh { + @Override + public Minecraft getMinecraft() { + return (Minecraft) MinecraftClient.getInstance(); + } + + @Override + public Renderer getRenderer() { + return new RendererMesh(); + } + + @Override + public Utilities getUtilities() { + return new UtilitiesMesh(); + } +} diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/BlockHitResultAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/BlockHitResultAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/BlockHitResultAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/BlockHitResultAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/HitResultAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/HitResultAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/HitResultAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/HitResultAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java similarity index 97% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java index b150c9a..6525ccc 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityAccessor.java @@ -39,10 +39,10 @@ public interface EntityAccessor { @Accessor("inNetherPortal") void setInNetherPortal(boolean value); - @Accessor("netherPortalCooldown") + @Accessor("portalCooldown") int getNetherPortalCooldown(); - @Accessor("netherPortalCooldown") + @Accessor("portalCooldown") void setNetherPortalCooldown(int value); @Accessor("netherPortalTime") diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java similarity index 99% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java index 85a980f..a104b64 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityLivingAccessor.java @@ -222,7 +222,7 @@ public interface EntityLivingAccessor { int getNextAirUnderwater(int air); @Invoker("getXpToDrop") - int getXpToDrop(PlayerEntity player); + int getXpToDrop(); @Invoker("shouldAlwaysDropXp") boolean isPlayer(); diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java similarity index 94% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java index 6dc6da6..7b6f88b 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/EntityPlayerAccessor.java @@ -40,4 +40,7 @@ public interface EntityPlayerAccessor { @Invoker("increaseRidingMotionStats") void increaseRidingMotionStats(double x, double y, double z); + + @Invoker("getOffGroundSpeed") + float getOffGroundSpeed(); } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/entity/player/EntityClientPlayerAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/ClientConnectionAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/ClientConnectionAccessor.java similarity index 87% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/ClientConnectionAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/ClientConnectionAccessor.java index 2472b60..cf03b21 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/ClientConnectionAccessor.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/network/ClientConnectionAccessor.java @@ -2,12 +2,11 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.GenericFutureListener; import net.minecraft.network.ClientConnection; import net.minecraft.network.NetworkSide; import net.minecraft.network.NetworkState; -import net.minecraft.network.Packet; +import net.minecraft.network.PacketCallbacks; +import net.minecraft.network.packet.Packet; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -60,7 +59,7 @@ public interface ClientConnectionAccessor { void channelRead(ChannelHandlerContext context, Packet packet); @Invoker("sendImmediately") - void sendImmediately(Packet packet, @Nullable GenericFutureListener> callback); + void sendImmediately(Packet packet, @Nullable PacketCallbacks packetCallbacks); @Invoker("getState") NetworkState getNetworkState(); diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockBreakingProgressS2CPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockBreakingProgressS2CPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockBreakingProgressS2CPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockBreakingProgressS2CPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockUpdateS2CPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockUpdateS2CPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockUpdateS2CPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BlockUpdateS2CPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BoatPaddleStateC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BoatPaddleStateC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BoatPaddleStateC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/BoatPaddleStateC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/ChatMessageC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/ChatMessageC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/ChatMessageC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/ChatMessageC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/HandSwingC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/HandSwingC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/HandSwingC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/HandSwingC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractAtHandlerAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractAtHandlerAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractAtHandlerAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractAtHandlerAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractHandlerAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractHandlerAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractHandlerAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/InteractHandlerAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInputC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInputC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInputC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInputC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractBlockC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractBlockC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractBlockC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractBlockC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractEntityC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractEntityC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractEntityC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractEntityC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractItemC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractItemC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractItemC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerInteractItemC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerMoveC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerMoveC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerMoveC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerMoveC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerPositionLookS2CPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerPositionLookS2CPacketAccessor.java similarity index 84% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerPositionLookS2CPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerPositionLookS2CPacketAccessor.java index ecb1bfa..0503293 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerPositionLookS2CPacketAccessor.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/PlayerPositionLookS2CPacketAccessor.java @@ -1,6 +1,7 @@ package net.meshmc.mesh.impl.mixin.accessors.packet; import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; +import net.minecraft.network.packet.s2c.play.PositionFlag; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.gen.Accessor; @@ -31,13 +32,9 @@ public interface PlayerPositionLookS2CPacketAccessor { @Mutable @Accessor("flags") - void setFlags(Set flags); + void setFlags(Set flags); @Mutable @Accessor("teleportId") void setTeleportId(int value); - - @Mutable - @Accessor("shouldDismount") - void setShouldDismount(boolean value); } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/TeleportConfirmC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/TeleportConfirmC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/TeleportConfirmC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/TeleportConfirmC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/VehicleMoveC2SPacketAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/VehicleMoveC2SPacketAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/VehicleMoveC2SPacketAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/packet/VehicleMoveC2SPacketAccessor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferBuilderAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferBuilderAccessor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferBuilderAccessor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferBuilderAccessor.java diff --git a/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferRendererAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferRendererAccessor.java new file mode 100644 index 0000000..233065c --- /dev/null +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/BufferRendererAccessor.java @@ -0,0 +1,19 @@ +package net.meshmc.mesh.impl.mixin.accessors.render; + +import net.minecraft.client.gl.VertexBuffer; +import net.minecraft.client.render.BufferRenderer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(BufferRenderer.class) +public interface BufferRendererAccessor { + @Accessor("currentVertexBuffer") + static VertexBuffer getCurrentVertexBuffer() { + throw new AssertionError(); + } + + @Accessor("currentVertexBuffer") + static void setCurrentVertexBuffer(VertexBuffer vao) { + throw new AssertionError(); + } +} diff --git a/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/VertexBufferAccessor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/VertexBufferAccessor.java new file mode 100644 index 0000000..5e3a6fb --- /dev/null +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/accessors/render/VertexBufferAccessor.java @@ -0,0 +1,26 @@ +package net.meshmc.mesh.impl.mixin.accessors.render; + +import net.minecraft.client.gl.VertexBuffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(VertexBuffer.class) +public interface VertexBufferAccessor { + @Accessor("vertexArrayId") + int getVertexArrayId(); + + @Accessor("vertexArrayId") + void setVertexArrayId(int vao); + + @Accessor("vertexBufferId") + int getVertexBufferId(); + + @Accessor("vertexBufferId") + void setVertexBufferId(int vbo); + + @Accessor("indexBufferId") + int getIndexBufferId(); + + @Accessor("indexBufferId") + void setIndexBufferId(int ibo); +} diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancement.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementBuilder.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/advancement/MixinAdvancementProgress.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMapColor.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/block/MixinMaterial.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinMinecraft.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/client/MixinSession.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinKeyboard.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinKeyboard.java similarity index 78% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinKeyboard.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinKeyboard.java index fc629fb..186d09f 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinKeyboard.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinKeyboard.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.events.client; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.events.client.InputEvent; import net.minecraft.client.Keyboard; import net.minecraft.client.MinecraftClient; @@ -15,9 +15,9 @@ public class MixinKeyboard { public void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) { if(window == MinecraftClient.getInstance().getWindow().getHandle()) { if(action == 0) { - Mesh.getMesh().getEventManager().post(new InputEvent.Keyboard.Released(key)); + MeshAPI.getEventManager().post(new InputEvent.Keyboard.Released(key)); } else { - Mesh.getMesh().getEventManager().post(new InputEvent.Keyboard.Pressed(key)); + MeshAPI.getEventManager().post(new InputEvent.Keyboard.Pressed(key)); } } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraftClient.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraftClient.java similarity index 70% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraftClient.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraftClient.java index 8ce623f..7b23a67 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraftClient.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMinecraftClient.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.events.client; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.MeshEvent; import net.meshmc.mesh.event.events.client.ScreenOpenedEvent; import net.meshmc.mesh.event.events.client.TickEvent; @@ -16,26 +16,26 @@ public class MixinMinecraftClient { @Inject(method = "tick", at = @At("HEAD")) public void preTick(CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.Client(MeshEvent.Era.BEFORE)); + MeshAPI.getEventManager().post(new TickEvent.Client(MeshEvent.Era.BEFORE)); } @Inject(method = "tick", at = @At("RETURN")) public void postTick(CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.Client(MeshEvent.Era.AFTER)); + MeshAPI.getEventManager().post(new TickEvent.Client(MeshEvent.Era.AFTER)); } @Inject(method = "render", at = @At("HEAD")) public void preGameLoop(boolean tick, CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.GameLoop(MeshEvent.Era.BEFORE)); + MeshAPI.getEventManager().post(new TickEvent.GameLoop(MeshEvent.Era.BEFORE)); } @Inject(method = "render", at = @At("RETURN")) public void postGameLoop(boolean tick, CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.GameLoop(MeshEvent.Era.AFTER)); + MeshAPI.getEventManager().post(new TickEvent.GameLoop(MeshEvent.Era.AFTER)); } @Inject(method = "setScreen", at = @At("RETURN")) public void postSetScreen(Screen screen, CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new ScreenOpenedEvent(screen instanceof TitleScreen)); + MeshAPI.getEventManager().post(new ScreenOpenedEvent(screen instanceof TitleScreen)); } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMouse.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMouse.java similarity index 85% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMouse.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMouse.java index f1f44e2..e04c537 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMouse.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/client/MixinMouse.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.events.client; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.events.client.InputEvent; import net.minecraft.client.MinecraftClient; import net.minecraft.client.Mouse; @@ -23,9 +23,9 @@ public class MixinMouse { public void onMouseButton(long window, int button, int action, int mods, CallbackInfo ci) { if(window == MinecraftClient.getInstance().getWindow().getHandle()) { if(action == 0) { - Mesh.getMesh().getEventManager().post(new InputEvent.Mouse.Released(button)); + MeshAPI.getEventManager().post(new InputEvent.Mouse.Released(button)); } else { - Mesh.getMesh().getEventManager().post(new InputEvent.Mouse.Pressed(button)); + MeshAPI.getEventManager().post(new InputEvent.Mouse.Pressed(button)); } } } @@ -33,7 +33,7 @@ public void onMouseButton(long window, int button, int action, int mods, Callbac @Inject(method = "onMouseScroll", at = @At("HEAD")) public void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) { if(window == MinecraftClient.getInstance().getWindow().getHandle()) { - Mesh.getMesh().getEventManager().post(new InputEvent.Mouse.Scrolled(vertical)); + MeshAPI.getEventManager().post(new InputEvent.Mouse.Scrolled(vertical)); } } @@ -50,7 +50,7 @@ public void onCursorPos(long window, double x, double y, CallbackInfo ci) { realX = MathHelper.clamp(realX + cursorDeltaX, 0, width - 1); realY = MathHelper.clamp(realY + cursorDeltaY, 0, height - 1); - Mesh.getMesh().getEventManager().post(new InputEvent.Mouse.Moved( + MeshAPI.getEventManager().post(new InputEvent.Mouse.Moved( realX, realY, cursorDeltaX, cursorDeltaY )); diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinClientPlayerEntity.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinClientPlayerEntity.java similarity index 77% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinClientPlayerEntity.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinClientPlayerEntity.java index 848a689..1757766 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinClientPlayerEntity.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinClientPlayerEntity.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.events.entity; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.MeshEvent; import net.meshmc.mesh.event.events.client.TickEvent; import net.minecraft.client.network.ClientPlayerEntity; @@ -13,11 +13,11 @@ public class MixinClientPlayerEntity { @Inject(method = "tickMovement", at = @At("HEAD")) public void preMotion(CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.Motion(MeshEvent.Era.BEFORE)); + MeshAPI.getEventManager().post(new TickEvent.Motion(MeshEvent.Era.BEFORE)); } @Inject(method = "tickMovement", at = @At("RETURN")) public void postMotion(CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.Motion(MeshEvent.Era.AFTER)); + MeshAPI.getEventManager().post(new TickEvent.Motion(MeshEvent.Era.AFTER)); } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java similarity index 99% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java index 9e17bf2..84365f7 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/entity/MixinEntity.java @@ -1,7 +1,7 @@ package net.meshmc.mesh.impl.mixin.events.entity; import dev.tigr.simpleevents.EventManager; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.api.entity.living.player.EntityPlayer; import net.meshmc.mesh.api.math.Vec3d; import net.meshmc.mesh.event.events.entity.EntityEvent; @@ -28,7 +28,7 @@ public class MixinEntity { @Shadow private int id; - EventManager EVENT_MANAGER = Mesh.getMesh().getEventManager(); + EventManager EVENT_MANAGER = MeshAPI.getEventManager(); @Inject(method = "kill", at = @At("HEAD"), cancellable = true) public void kill1(CallbackInfo ci) { diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java similarity index 56% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java index 8538a62..66f6729 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/network/MixinNetworkConnection.java @@ -1,14 +1,14 @@ package net.meshmc.mesh.impl.mixin.events.network; import io.netty.channel.ChannelHandlerContext; -import io.netty.util.concurrent.Future; -import io.netty.util.concurrent.GenericFutureListener; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.MeshEvent; import net.meshmc.mesh.event.events.network.NetworkConnectionEvent; import net.meshmc.mesh.impl.util.Mappings; import net.minecraft.network.ClientConnection; -import net.minecraft.network.Packet; +import net.minecraft.network.PacketCallbacks; +import net.minecraft.network.packet.Packet; +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -16,29 +16,29 @@ @Mixin(value = ClientConnection.class, priority = Integer.MAX_VALUE) public class MixinNetworkConnection { - @Inject(method = "send(Lnet/minecraft/network/Packet;Lio/netty/util/concurrent/GenericFutureListener;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;isOpen()Z", shift = At.Shift.BEFORE), cancellable = true) - public void onSendPre(net.minecraft.network.Packet packet, GenericFutureListener> callback, CallbackInfo ci) { - if(Mesh.getMesh().getEventManager() - .post(new NetworkConnectionEvent.sendPacket(MeshEvent.Era.BEFORE, Mappings.packet(packet), callback)) + @Inject(method = "send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;isOpen()Z", shift = At.Shift.BEFORE), cancellable = true) + public void onSendPre(Packet packet, @Nullable PacketCallbacks packetCallbacks, CallbackInfo ci) { + if(MeshAPI.getEventManager() + .post(new NetworkConnectionEvent.sendPacket(MeshEvent.Era.BEFORE, Mappings.packet(packet))) .isCancelled()) ci.cancel(); } - @Inject(method = "send(Lnet/minecraft/network/Packet;Lio/netty/util/concurrent/GenericFutureListener;)V", at = @At(value = "TAIL")) - public void onSendPost(net.minecraft.network.Packet packet, GenericFutureListener> callback, CallbackInfo ci) { - Mesh.getMesh().getEventManager() - .post(new NetworkConnectionEvent.sendPacket(MeshEvent.Era.AFTER, Mappings.packet(packet), callback)); + @Inject(method = "send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;)V", at = @At(value = "TAIL")) + public void onSendPost(Packet packet, @Nullable PacketCallbacks packetCallbacks, CallbackInfo ci) { + MeshAPI.getEventManager() + .post(new NetworkConnectionEvent.sendPacket(MeshEvent.Era.AFTER, Mappings.packet(packet))); } @Inject(method = "channelRead0*", at = @At("HEAD"), cancellable = true) public void receivedPre(ChannelHandlerContext channelHandlerContext, Packet packet, CallbackInfo ci) { - if(Mesh.getMesh().getEventManager() + if(MeshAPI.getEventManager() .post(new NetworkConnectionEvent.channelRead0(MeshEvent.Era.BEFORE, channelHandlerContext, Mappings.packet(packet))) .isCancelled()) ci.cancel(); } @Inject(method = "channelRead0*", at = @At("TAIL")) public void receivedPost(ChannelHandlerContext channelHandlerContext, Packet packet, CallbackInfo ci) { - Mesh.getMesh().getEventManager() + MeshAPI.getEventManager() .post(new NetworkConnectionEvent.channelRead0(MeshEvent.Era.AFTER, channelHandlerContext, Mappings.packet(packet))); } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGameRenderer.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGameRenderer.java similarity index 70% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGameRenderer.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGameRenderer.java index 74a5836..94889d4 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGameRenderer.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinGameRenderer.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.events.render; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.events.render.RenderEvent; import net.meshmc.mesh.impl.wrapper.render.MatrixStackMesh; import net.minecraft.client.render.Camera; @@ -15,8 +15,8 @@ public class MixinGameRenderer { @Inject(method = "renderHand", at = @At("HEAD")) public void renderWorld(MatrixStack matrices, Camera camera, float tickDelta, CallbackInfo ci) { - ((MatrixStackMesh) Mesh.getMesh().getRenderer().getRenderStack()).setMatrixStack(matrices); - Mesh.getMesh().getEventManager().post(new RenderEvent.World(tickDelta)); - ((MatrixStackMesh) Mesh.getMesh().getRenderer().getRenderStack()).setMatrixStack(new MatrixStack()); + ((MatrixStackMesh) MeshAPI.getRenderer().getRenderStack()).setMatrixStack(matrices); + MeshAPI.getEventManager().post(new RenderEvent.World(tickDelta)); + ((MatrixStackMesh) MeshAPI.getRenderer().getRenderStack()).setMatrixStack(new MatrixStack()); } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinInGameHud.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinInGameHud.java similarity index 86% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinInGameHud.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinInGameHud.java index 555934f..62dccae 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinInGameHud.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/render/MixinInGameHud.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.events.render; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.events.render.RenderEvent; import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.client.util.math.MatrixStack; @@ -13,6 +13,6 @@ public class MixinInGameHud { @Inject(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;heldItemTooltips:Z")) public void renderOverlayPost(MatrixStack matrices, float tickDelta, CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new RenderEvent.Hud(tickDelta)); + MeshAPI.getEventManager().post(new RenderEvent.Hud(tickDelta)); } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinClientWorld.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinClientWorld.java similarity index 76% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinClientWorld.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinClientWorld.java index 8bc2335..2cb4d4f 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinClientWorld.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/events/world/MixinClientWorld.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.events.world; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.event.MeshEvent; import net.meshmc.mesh.event.events.client.TickEvent; import net.minecraft.client.world.ClientWorld; @@ -13,11 +13,11 @@ public abstract class MixinClientWorld { @Inject(method = "tick", at = @At("HEAD")) public void preTick(CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.World(MeshEvent.Era.BEFORE)); + MeshAPI.getEventManager().post(new TickEvent.World(MeshEvent.Era.BEFORE)); } @Inject(method = "tick", at = @At("RETURN")) public void postTick(CallbackInfo ci) { - Mesh.getMesh().getEventManager().post(new TickEvent.World(MeshEvent.Era.AFTER)); + MeshAPI.getEventManager().post(new TickEvent.World(MeshEvent.Era.AFTER)); } } diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBlockPos.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinBox.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec2f.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3d.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java similarity index 82% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java index 86633af..e47cde8 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3f.java @@ -1,16 +1,15 @@ package net.meshmc.mesh.impl.mixin.math; import net.meshmc.mesh.api.math.Vec3f; +import org.joml.Vector3f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Mixin(net.minecraft.util.math.Vec3f.class) +@Mixin(Vector3f.class) public class MixinVec3f implements Vec3f { - @Shadow private float x; - - @Shadow private float y; - - @Shadow private float z; + @Shadow public float x; + @Shadow public float y; + @Shadow public float z; @Override public float getX() { diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/math/MixinVec3i.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java similarity index 84% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java index 07b5c33..3bf1b89 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/network/MixinNetworkConnectionQueuedPacket.java @@ -15,8 +15,8 @@ @Mixin(targets = "net.minecraft.network.ClientConnection$QueuedPacket") public class MixinNetworkConnectionQueuedPacket implements NetworkConnection.QueuedPacket { @Mutable @Shadow @Final - net.minecraft.network.Packet packet; - @Mutable @Shadow @Final @Nullable GenericFutureListener> callback; + net.minecraft.network.packet.Packet packet; +// @Mutable @Shadow @Final @Nullable GenericFutureListener> callback; @Override public Packet getPacket() { @@ -31,7 +31,8 @@ public void setPacket(Packet packet) { @Override public GenericFutureListener>[] getCallbacks() { GenericFutureListener>[] l = new GenericFutureListener[1]; - l[0] = callback; + // TODO: New 1.19 MC specific callbacks +// l[0] = callback; return l; } @@ -40,7 +41,7 @@ public void setCallbacks(GenericFutureListener>[] if(callbacks == null) return; for(GenericFutureListener> cb: callbacks) if(cb != null) { - this.callback = cb; +// this.callback = cb; break; } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinFramebuffer.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinScreen.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinScreen.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinScreen.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinScreen.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java similarity index 74% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java index 4106e18..914fed3 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/render/MixinTextRenderer.java @@ -1,6 +1,6 @@ package net.meshmc.mesh.impl.mixin.render; -import net.meshmc.mesh.Mesh; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.impl.wrapper.render.MatrixStackMesh; import net.meshmc.mesh.util.render.Color; import net.minecraft.client.font.TextRenderer; @@ -15,11 +15,11 @@ public abstract class MixinTextRenderer implements net.meshmc.mesh.api.render.Te @Override public void drawText(String text, float x, float y, Color color) { - draw(((MatrixStackMesh) Mesh.getMesh().getRenderer().getRenderStack()).getMatrixStack(), text, x, y, color.getRGB()); + draw(((MatrixStackMesh) MeshAPI.getRenderer().getRenderStack()).getMatrixStack(), text, x, y, color.getRGB()); } @Override public void drawTextWithShadow(String text, float x, float y, Color color) { - drawWithShadow(((MatrixStackMesh) Mesh.getMesh().getRenderer().getRenderStack()).getMatrixStack(), text, x, y, color.getRGB()); + drawWithShadow(((MatrixStackMesh) MeshAPI.getRenderer().getRenderStack()).getMatrixStack(), text, x, y, color.getRGB()); } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/mixin/util/MixinLocationIdentifier.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/MCEnum.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/Mappings.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/Mappings.java similarity index 99% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/Mappings.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/Mappings.java index 984620b..66f08db 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/Mappings.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/Mappings.java @@ -71,7 +71,7 @@ import net.minecraft.entity.passive.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.raid.RaiderEntity; -import net.minecraft.network.Packet; +import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.c2s.play.*; import net.minecraft.network.packet.s2c.play.*; import net.minecraft.server.network.ServerPlayerEntity; @@ -184,7 +184,7 @@ public static net.meshmc.mesh.api.entity.Entity entity(T enti entityClassMap.put(CowEntity.class, value -> new EntityCowMesh<>((CowEntity) value)); entityClassMap.put(MooshroomEntity.class, value -> new EntityMooshroomMesh<>((MooshroomEntity) value)); - entityClassMap.put(HorseBaseEntity.class, value -> new EntityHorseBaseMesh<>((HorseBaseEntity) value)); + entityClassMap.put(AbstractHorseEntity.class, value -> new EntityHorseBaseMesh<>((AbstractHorseEntity) value)); entityClassMap.put(HorseEntity.class, value -> new EntityHorseMesh<>((HorseEntity) value)); entityClassMap.put(SkeletonHorseEntity.class, value -> new EntitySkeletonHorseMesh<>((SkeletonHorseEntity) value)); entityClassMap.put(ZombieHorseEntity.class, value -> new EntityZombieHorseMesh<>((ZombieHorseEntity) value)); @@ -1724,7 +1724,7 @@ public static Enum blockVariant(Block block, AbstractBlock.AbstractBlockState } - public static > net.meshmc.mesh.api.network.Packet packet(T packet) { + public static net.meshmc.mesh.api.network.Packet packet(T packet) { if(packet == null) return null; var p = packetMap.get(packet.getClass()); if(p == null) return new PacketMesh<>(packet); diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/MeshEnum.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java similarity index 96% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java index 16dd1f9..fc20594 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/util/ScreenAdapter.java @@ -4,7 +4,7 @@ import net.meshmc.mesh.api.render.ScreenContext; import net.minecraft.client.MinecraftClient; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; /** * Wraps a mesh screen around minecraft's Screen class so that native methods can be called @@ -14,7 +14,7 @@ public class ScreenAdapter extends net.minecraft.client.gui.screen.Screen { private final Screen screen; public ScreenAdapter(Screen screen) { - super(new LiteralText(screen.getTitle())); + super(Text.of(screen.getTitle())); this.screen = screen; screen.setContext((ScreenContext) this); } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/block/BlockStateMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterable.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityIterator.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/collections/EntityList.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java similarity index 98% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java index 57d36e2..288f538 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/EntityMesh.java @@ -376,12 +376,12 @@ public void setNextStepSoundDistance(float value) { @Override public float getStepHeight() { - return getMeshValue().stepHeight; + return getMeshValue().getStepHeight(); } @Override public void setStepHeight(float value) { - getMeshValue().stepHeight = value; + getMeshValue().setStepHeight(value); } @Override @@ -806,7 +806,7 @@ public void setInNetherPortal(BlockPos blockPos) { @Override public int getDefaultNetherPortalCooldown() { - return getMeshValue().getDefaultNetherPortalCooldown(); + return getMeshValue().getDefaultPortalCooldown(); } @Override @@ -815,8 +815,8 @@ public void handleStatus(byte status) { } @Override - public void performHurtAnimation() { - getMeshValue().animateDamage(); + public void performHurtAnimation(float damageTiltYaw) { + getMeshValue().animateDamage(damageTiltYaw); } @Override @@ -1011,7 +1011,7 @@ public boolean entityDataRequiresOperator() { @Override public Entity getControllingRider() { - return Mappings.entity(getMeshValue().getPrimaryPassenger()); + return Mappings.entity(getMeshValue().getControllingPassenger()); } @Override diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java similarity index 95% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java index 93640e6..46a6089 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntityLivingMesh.java @@ -15,7 +15,6 @@ import net.meshmc.mesh.impl.wrapper.entity.living.player.EntityPlayerMesh; import net.meshmc.mesh.util.math.Hand; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.damage.DamageSource; import java.util.Random; @@ -85,13 +84,14 @@ public void setMaxHurtTime(int value) { } @Override - public float getAttackedAtYaw() { - return getMeshValue().knockbackVelocity; + public Float getAttackedAtYaw() { + return null; +// return getMeshValue().knockbackVelocity; } @Override public void setAttackedAtYaw(float value) { - getMeshValue().knockbackVelocity = value; +// getMeshValue().knockbackVelocity = value; } @Override @@ -135,33 +135,36 @@ public void setLastAttackedTicks(int value) { } @Override - public float getPrevSwingDistance() { - return getMeshValue().lastLimbDistance; + public Float getPrevSwingDistance() { + return null; +// return getMeshValue().lastLimbDistance; } @Override public void setPrevSwingDistance(float value) { - getMeshValue().lastLimbDistance = value; +// getMeshValue().lastLimbDistance = value; } @Override - public float getSwingDistance() { - return getMeshValue().limbDistance; + public Float getSwingDistance() { + return null; +// return getMeshValue().limbDistance; } @Override public void setSwingDistance(float value) { - getMeshValue().limbDistance = value; +// getMeshValue().limbDistance = value; } @Override - public float getLimbAngle() { - return getMeshValue().limbAngle; + public Float getLimbAngle() { + return null; +// return getMeshValue().limbAngle; } @Override public void setLimbAngle(float value) { - getMeshValue().limbAngle = value; +// getMeshValue().limbAngle = value; } @Override @@ -225,13 +228,14 @@ public void setPrevHeadYaw(float value) { } @Override - public float getAirStrafingSpeed() { - return getMeshValue().airStrafingSpeed; + public Float getAirStrafingSpeed() { + return null; +// return getMeshValue().airStrafingSpeed; } @Override public void setAirStrafingSpeed(float value) { - getMeshValue().airStrafingSpeed = value; +// getMeshValue().airStrafingSpeed = value; } @Override @@ -587,7 +591,7 @@ public int nextAirSupplyUnderwater(int air) { @Override public int getXpToDrop(EntityPlayer player) { - return ((EntityLivingAccessor) getMeshValue()).getXpToDrop(((EntityPlayerMesh) player).getMeshValue()); + return ((EntityLivingAccessor) getMeshValue()).getXpToDrop(); } @Override @@ -597,7 +601,9 @@ public boolean isPlayer() { @Override public Random getRNG() { - return getMeshValue().getRandom(); + // TODO: FIX + return null; +// return getMeshValue().getRandom(); } @Override @@ -642,12 +648,13 @@ public void knockBack(float strength, double xRatio, double zRatio) { @Override public void fallDamage(float fallDistance, float damageMultiplier) { - getMeshValue().handleFallDamage(fallDistance, damageMultiplier, DamageSource.FALL); + // TODO: DamageSource??? +// getMeshValue().handleFallDamage(fallDistance, damageMultiplier, DamageSource.FALL); } @Override - public void hurtAnimation() { - getMeshValue().animateDamage(); + public void hurtAnimation(float hurtTiltYaw) { + getMeshValue().animateDamage(hurtTiltYaw); } @Override diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/EntitySlimeMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/EntityMobMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityBlazeMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityCreeperMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermanMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityEndermiteMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityGiantMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityHostileMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntitySilverfishMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityVexMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityWitherMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityZoglinMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityZoglinMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityZoglinMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/EntityZoglinMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityElderGuardianMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/guardian/EntityGuardianMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinAbstractMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinAbstractMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinAbstractMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinAbstractMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinBruteMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinBruteMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinBruteMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinBruteMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/piglin/EntityPiglinMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityEvokerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllagerSpellcasterMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityIllusionerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityPillagerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityPillagerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityPillagerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityPillagerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRaiderAbstractMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRavagerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRavagerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRavagerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityRavagerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityVindicatorMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/raider/EntityWitchMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonAbstractMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntitySkeletonMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityStrayMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/skeleton/EntityWitherSkeletonMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntityCaveSpiderMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/spider/EntitySpiderMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityDrownedMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityDrownedMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityDrownedMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityDrownedMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityHuskMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombiePigmanMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/hostile/zombie/EntityZombieVillagerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityPassiveMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityVillagerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityWanderingTraderMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityWanderingTraderMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityWanderingTraderMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/EntityWanderingTraderMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAnimalMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAxolotlMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAxolotlMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAxolotlMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityAxolotlMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityBeeMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityBeeMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityBeeMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityBeeMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityChickenMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityFoxMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityFoxMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityFoxMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityFoxMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityGoatMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityGoatMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityGoatMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityGoatMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityHoglinMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityHoglinMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityHoglinMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityHoglinMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityOcelotMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityOcelotMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityOcelotMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityOcelotMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPandaMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPandaMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPandaMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPandaMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPigMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityPolarBearMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityRabbitMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntitySheepMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityStriderMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityStriderMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityStriderMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityStriderMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityTurtleMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityTurtleMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityTurtleMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/EntityTurtleMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityCowMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/cow/EntityMooshroomMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java similarity index 64% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java index 78dbd4d..5ada970 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseBaseMesh.java @@ -2,9 +2,9 @@ import net.meshmc.mesh.api.entity.living.mob.passive.animal.horse.EntityHorseBase; import net.meshmc.mesh.impl.wrapper.entity.living.mob.passive.animal.EntityAnimalMesh; -import net.minecraft.entity.passive.HorseBaseEntity; +import net.minecraft.entity.passive.AbstractHorseEntity; -public class EntityHorseBaseMesh extends EntityAnimalMesh implements EntityHorseBase { +public class EntityHorseBaseMesh extends EntityAnimalMesh implements EntityHorseBase { public EntityHorseBaseMesh(T value) { super(value); } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityHorseMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntitySkeletonHorseMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/EntityZombieHorseMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityAbstractDonkeyMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityDonkeyMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/EntityMuleMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityLlamaMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlamaMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlamaMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlamaMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/horse/donkey/llama/EntityTraderLlamaMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityCatMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityTameableMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/EntityWolfMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityParrotMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/mob/passive/animal/tameable/shoulder/EntityShoulderTameableMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityAbstractClientPlayerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java similarity index 99% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java index 39b4252..76bc705 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityClientPlayerMesh.java @@ -291,7 +291,7 @@ public void dropSelectedItem(boolean entireStack) { @Override public void sendChatMessage(String message) { - getMeshValue().sendChatMessage(message); + getMeshValue().networkHandler.sendChatMessage(message); } @Override @@ -382,7 +382,7 @@ public void setShowsDeathScreen(boolean value) { @Override public boolean hasJumpingMount() { - return getMeshValue().hasJumpingMount(); + return getMeshValue().getJumpingMount() != null; } @Override diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityOtherClientPlayerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java similarity index 98% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java index 6a3080b..2f6eebb 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityPlayerMesh.java @@ -153,12 +153,12 @@ public void setEnchantmentTableSeed(int value) { @Override public float getSpeedInAir() { - return getMeshValue().airStrafingSpeed; + return ((EntityPlayerAccessor) getMeshValue()).getOffGroundSpeed(); } @Override public void setSpeedInAir(float value) { - getMeshValue().airStrafingSpeed = value; +// getMeshValue().airStrafingSpeed = value; } @Override diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/player/EntityServerPlayerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityDolphinMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityDolphinMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityDolphinMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityDolphinMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/EntityWaterCreatureMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityFishMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityFishMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityFishMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityFishMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityPufferfishMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityPufferfishMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityPufferfishMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/EntityPufferfishMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityCodMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityCodMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityCodMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityCodMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySalmonMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySalmonMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySalmonMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySalmonMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySchoolingFishMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySchoolingFishMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySchoolingFishMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntitySchoolingFishMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityTropicalFishMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityTropicalFishMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityTropicalFishMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/fish/schooling/EntityTropicalFishMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntityGlowSquidMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntityGlowSquidMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntityGlowSquidMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntityGlowSquidMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/entity/living/water/squid/EntitySquidMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java similarity index 94% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java index 910aee1..9ce46a5 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/ClientPlayNetworkConnectionMesh.java @@ -3,7 +3,7 @@ import net.meshmc.mesh.api.network.ClientPlayNetworkConnection; import net.meshmc.mesh.api.network.NetworkConnection; import net.minecraft.client.network.ClientPlayNetworkHandler; -import net.minecraft.network.Packet; +import net.minecraft.network.packet.Packet; public class ClientPlayNetworkConnectionMesh extends ClientPlayNetworkConnection { public ClientPlayNetworkConnectionMesh(net.minecraft.client.network.ClientPlayNetworkHandler value) { diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java similarity index 94% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java index 047edd3..c01c843 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/NetworkConnectionMesh.java @@ -146,7 +146,8 @@ public void sendPacket(Packet packet) { @Override public void sendPacket(Packet packet, GenericFutureListener> callback) { - getMeshValue().send(((PacketMesh) packet).getMeshValue(), callback); + // TODO: +// getMeshValue().send(((PacketMesh) packet).getMeshValue(), callback); } @Override @@ -154,7 +155,8 @@ public void sendPacketImmediately(Packet packet, GenericFutureListener) packet).getMeshValue(), call); + // TODO: Why'd they have to change to a MC specific callback -_- +// ((ClientConnectionAccessor) getMeshValue()).sendImmediately(((PacketMesh) packet).getMeshValue(), call); break; } } @@ -203,7 +205,7 @@ public boolean isChannelOpen() { @Override public boolean hasNoChannel() { - return getMeshValue().hasChannel(); // "hasChannel" checks the opposite... + return getMeshValue().isChannelAbsent(); } @Override diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketListenerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java similarity index 95% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java index f7c653d..fc3fc8f 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/PacketMesh.java @@ -2,8 +2,8 @@ import io.netty.buffer.ByteBuf; import net.meshmc.mesh.api.AbstractMesh; -import net.minecraft.network.Packet; import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.packet.Packet; public class PacketMesh> extends AbstractMesh implements net.meshmc.mesh.api.network.Packet { public PacketMesh(T value) { diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java similarity index 80% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java index 22745aa..91829f1 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketChatMessageMesh.java @@ -1,7 +1,6 @@ package net.meshmc.mesh.impl.wrapper.network.client; import net.meshmc.mesh.api.network.client.CPacketChatMessage; -import net.meshmc.mesh.impl.mixin.accessors.packet.ChatMessageC2SPacketAccessor; import net.meshmc.mesh.impl.wrapper.network.PacketMesh; import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; import org.jetbrains.annotations.Nullable; @@ -20,12 +19,7 @@ public C2S getType() { @Override public String getMessage() { - return getMeshValue().getChatMessage(); - } - - @Override - public void setMessage(String message) { - ((ChatMessageC2SPacketAccessor) getMeshValue()).setMessage(message); + return getMeshValue().chatMessage(); } @Nullable diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketConfirmTeleportMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketHandSwingMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketInputMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMovePlayerMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketMoveVehicleMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketSteerBoatMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseBlockMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseEntityMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/client/CPacketUseItemMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketAdvancementUpdateMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockActionMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBlockUpdateMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketBreakProgressMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java similarity index 86% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java index dcf137c..21f9b02 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketPlayerPositionRotationMesh.java @@ -4,6 +4,7 @@ import net.meshmc.mesh.impl.mixin.accessors.packet.PlayerPositionLookS2CPacketAccessor; import net.meshmc.mesh.impl.wrapper.network.PacketMesh; import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket; +import net.minecraft.network.packet.s2c.play.PositionFlag; import java.util.HashSet; import java.util.Set; @@ -81,16 +82,16 @@ public void setTeleportId(int value) { @Override public Set getFlags() { Set flagSet = new HashSet<>(); - for(PlayerPositionLookS2CPacket.Flag flag: getMeshValue().getFlags()) { + for(PositionFlag flag: getMeshValue().getFlags()) { flagSet.add(Flag.VALUES[flag.ordinal()]); } return flagSet; } - public static final PlayerPositionLookS2CPacket.Flag[] FLAGS = PlayerPositionLookS2CPacket.Flag.values(); + public static final PositionFlag[] FLAGS = PositionFlag.values(); @Override public void setFlags(Set flags) { - Set flagSet = new HashSet<>(); + Set flagSet = new HashSet<>(); for(Flag flag: flags) { flagSet.add(FLAGS[flag.ordinal()]); } @@ -109,11 +110,9 @@ public void removeFlag(Flag flag) { @Override public Boolean getShouldDismount() { - return getMeshValue().shouldDismount(); + return null; } @Override - public void setShouldDismount(boolean value) { - ((PlayerPositionLookS2CPacketAccessor) getMeshValue()).setShouldDismount(value); - } + public void setShouldDismount(boolean value) {} } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/network/server/SPacketTileEntityUpdateMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java similarity index 85% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java index 2337fa8..8d7c1dd 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferBuilderMesh.java @@ -1,24 +1,25 @@ package net.meshmc.mesh.impl.wrapper.render; import com.mojang.blaze3d.systems.RenderSystem; -import net.meshmc.mesh.Mesh; -import net.meshmc.mesh.api.render.buffer.BufferBuilder; +import net.meshmc.mesh.MeshAPI; import net.meshmc.mesh.api.render.Renderer; +import net.meshmc.mesh.api.render.buffer.BufferBuilder; import net.meshmc.mesh.impl.mixin.accessors.render.BufferBuilderAccessor; import net.meshmc.mesh.util.render.Vertex; import net.minecraft.client.render.BufferRenderer; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.VertexFormat; import net.minecraft.client.render.VertexFormats; -import net.minecraft.util.math.Matrix3f; -import net.minecraft.util.math.Matrix4f; -import net.minecraft.util.math.Vec3f; +import org.joml.Matrix3f; +import org.joml.Matrix4f; +import org.joml.Vector3f; import java.util.ArrayList; import java.util.List; /** * @author Tigermouthbear & Makrennel 1/15/22 + * // TODO: Does this still work? */ public class BufferBuilderMesh extends BufferBuilder { public BufferBuilderMesh(net.minecraft.client.render.BufferBuilder value) { @@ -31,23 +32,23 @@ public void begin(Renderer.DrawMode drawMode, Renderer.VertexFormat vertexFormat switch(vertexFormat) { case LINES -> { if(drawMode == Renderer.DrawMode.LINES) { - RenderSystem.setShader(GameRenderer::getRenderTypeLinesShader); + RenderSystem.setShader(GameRenderer::getRenderTypeLinesProgram); format = VertexFormats.LINES; } else { - RenderSystem.setShader(GameRenderer::getPositionColorShader); + RenderSystem.setShader(GameRenderer::getPositionColorProgram); format = VertexFormats.POSITION_COLOR; } } case POSITION_TEXTURE -> { - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(GameRenderer::getPositionTexProgram); format = VertexFormats.POSITION_TEXTURE; } case POSITION_TEXTURE_COLOR -> { - RenderSystem.setShader(GameRenderer::getPositionColorTexShader); + RenderSystem.setShader(GameRenderer::getPositionColorTexProgram); format = VertexFormats.POSITION_COLOR_TEXTURE; } default -> { - RenderSystem.setShader(GameRenderer::getPositionColorShader); + RenderSystem.setShader(GameRenderer::getPositionColorProgram); format = VertexFormats.POSITION_COLOR; } } @@ -96,7 +97,7 @@ public void construct(Vertex... vertices) { else for(Vertex vert: vertices) vertex(vert, null); } - private void vertex(Vertex vert, Vec3f normalVec) { + private void vertex(Vertex vert, Vector3f normalVec) { getMeshValue().vertex(getModel(), (float) vert.x, (float) vert.y, (float) vert.z); // 1.18: Color 1st, Texture 2nd @@ -107,7 +108,7 @@ private void vertex(Vertex vert, Vec3f normalVec) { getMeshValue().texture(vert.u, vert.v); if(normalVec != null) - getMeshValue().normal(getNormal(), normalVec.getX(), normalVec.getY(), normalVec.getZ()); + getMeshValue().normal(getNormal(), normalVec.x, normalVec.y, normalVec.z); getMeshValue().next(); } @@ -116,7 +117,7 @@ private class Line { Vertex vertex1, vertex2; - public Vec3f normalVec; + public Vector3f normalVec; Line(Vertex vertex1, Vertex vertex2) { this.vertex1 = vertex1; @@ -129,12 +130,11 @@ private class Line { @Override public void draw() { RenderSystem.setShaderColor(1, 1, 1, 1); - getMeshValue().end(); - BufferRenderer.draw(getMeshValue()); + BufferRenderer.draw(getMeshValue().end()); } MatrixStackMesh getRenderStack() { - return (MatrixStackMesh) Mesh.getMesh().getRenderer().getRenderStack(); + return (MatrixStackMesh) MeshAPI.getRenderer().getRenderStack(); } Matrix4f getModel() { @@ -145,12 +145,12 @@ Matrix3f getNormal() { return getRenderStack().getMatrixStack().peek().getNormalMatrix(); } - Vec3f getNormal(double x1, double y1, double z1, double x2, double y2, double z2) { + Vector3f getNormal(double x1, double y1, double z1, double x2, double y2, double z2) { return getNormal((float) x1, (float) y1, (float) z1, (float) x2, (float) y2, (float) z2); } - Vec3f getNormal(float x1, float y1, float z1, float x2, float y2, float z2) { - Vec3f normal = new Vec3f(x2 - x1, y2 - y1, z2 - z1); + Vector3f getNormal(float x1, float y1, float z1, float x2, float y2, float z2) { + Vector3f normal = new Vector3f(x2 - x1, y2 - y1, z2 - z1); normal.normalize(); return normal; } diff --git a/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferRendererMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferRendererMesh.java new file mode 100644 index 0000000..83158ec --- /dev/null +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/BufferRendererMesh.java @@ -0,0 +1,37 @@ +package net.meshmc.mesh.impl.wrapper.render; + +import net.meshmc.mesh.api.render.buffer.BufferRenderer; +import net.meshmc.mesh.impl.mixin.accessors.render.BufferRendererAccessor; +import net.meshmc.mesh.impl.mixin.accessors.render.VertexBufferAccessor; + +public class BufferRendererMesh implements BufferRenderer { + @Override + public int getVertexArray() { + return ((VertexBufferAccessor) BufferRendererAccessor.getCurrentVertexBuffer()).getVertexArrayId(); + } + + @Override + public void setVertexArray(int vao) { + ((VertexBufferAccessor) BufferRendererAccessor.getCurrentVertexBuffer()).setVertexArrayId(vao); + } + + @Override + public int getVertexBuffer() { + return ((VertexBufferAccessor) BufferRendererAccessor.getCurrentVertexBuffer()).getVertexBufferId(); + } + + @Override + public void setVertexBuffer(int vbo) { + ((VertexBufferAccessor) BufferRendererAccessor.getCurrentVertexBuffer()).setVertexBufferId(vbo); + } + + @Override + public int getElementBuffer() { + return ((VertexBufferAccessor) BufferRendererAccessor.getCurrentVertexBuffer()).getIndexBufferId(); + } + + @Override + public void setElementBuffer(int ibo) { + ((VertexBufferAccessor) BufferRendererAccessor.getCurrentVertexBuffer()).setIndexBufferId(ibo); + } +} diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/CameraMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java similarity index 66% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java index c8f74e5..7a96b95 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/MatrixStackMesh.java @@ -2,10 +2,8 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.meshmc.mesh.api.render.buffer.MatrixStack; -import net.minecraft.util.math.Quaternion; -import org.lwjgl.BufferUtils; - -import java.nio.FloatBuffer; +import org.joml.Matrix4f; +import org.joml.Quaternionf; /** * @author Tigermouthbear 1/15/22 @@ -35,21 +33,17 @@ public void translate(double x, double y, double z) { @Override public void rotate(float angle, float x, float y, float z) { - matrixStack.multiply(new Quaternion(x * angle, y * angle, z * angle, true)); + matrixStack.multiply(new Quaternionf(x, y, z, angle)); } @Override - public FloatBuffer getProjectionMatrix() { - FloatBuffer buffer = BufferUtils.createFloatBuffer(16); - RenderSystem.getProjectionMatrix().write(buffer, false); - return buffer; + public Matrix4f getProjectionMatrix() { + return RenderSystem.getProjectionMatrix(); } @Override - public FloatBuffer getModelMatrix() { - FloatBuffer buffer = BufferUtils.createFloatBuffer(16); - matrixStack.peek().getPositionMatrix().write(buffer, false); - return buffer; + public Matrix4f getModelMatrix() { + return matrixStack.peek().getPositionMatrix(); } public void setMatrixStack(net.minecraft.client.util.math.MatrixStack matrixStack) { diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java similarity index 91% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java index 8291cf7..e7a3fe6 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/RenderStateMesh.java @@ -79,10 +79,10 @@ public RenderState scissor(boolean state) { return this; } - @Override - public RenderState texture(boolean state) { - if(state) RenderSystem.enableTexture(); - else RenderSystem.disableTexture(); - return this; - } +// @Override +// public RenderState texture(boolean state) { +// if(state) RenderSystem.enableTexture(); +// else RenderSystem.disableTexture(); +// return this; +// } } diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/render/RendererMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/util/KeyboardMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/util/ProfilerMesh.java diff --git a/mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java similarity index 100% rename from mesh-forge-1.12.2/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/util/UtilitiesMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/world/ClientWorldMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/impl/wrapper/world/WorldMesh.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/statics/StaticMapColors.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java similarity index 100% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/statics/StaticMaterials.java diff --git a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/statics/StaticPackets.java b/version/v1_19_4/src/main/java/net/meshmc/mesh/statics/StaticPackets.java similarity index 95% rename from mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/statics/StaticPackets.java rename to version/v1_19_4/src/main/java/net/meshmc/mesh/statics/StaticPackets.java index a1b3d7d..675cb9f 100644 --- a/mesh-fabric-1.18.2/src/main/java/net/meshmc/mesh/statics/StaticPackets.java +++ b/version/v1_19_4/src/main/java/net/meshmc/mesh/statics/StaticPackets.java @@ -36,7 +36,8 @@ public class StaticPackets { // C2S // Chat Message public static CPacketChatMessage createCPacketChatMessage(String message) { - return new CPacketChatMessageMesh(new ChatMessageC2SPacket(message)); + throw new RuntimeException("createCPacketChatMessage Not Yet Implemented"); +// return new CPacketChatMessageMesh(new ChatMessageC2SPacket(message)); } public static CPacketChatMessage createCPacketChatMessage(ByteBuf buf) { @@ -133,8 +134,8 @@ public static CPacketSteerBoat createCPacketSteerBoat(ByteBuf buf) { } // Use Block - public static CPacketUseBlock createCPacketUseBlock(Hand hand, BlockPos blockPos, Facing facing, Vec3d vector, boolean insideBlock) { - return new CPacketUseBlockMesh(new PlayerInteractBlockC2SPacket(MCEnum.hand(hand), new BlockHitResult((net.minecraft.util.math.Vec3d) vector, MCEnum.facing(facing), (net.minecraft.util.math.BlockPos) blockPos, insideBlock))); + public static CPacketUseBlock createCPacketUseBlock(Hand hand, BlockPos blockPos, Facing facing, Vec3d vector, boolean insideBlock, int sequence) { + return new CPacketUseBlockMesh(new PlayerInteractBlockC2SPacket(MCEnum.hand(hand), new BlockHitResult((net.minecraft.util.math.Vec3d) vector, MCEnum.facing(facing), (net.minecraft.util.math.BlockPos) blockPos, insideBlock), sequence)); } public static CPacketUseBlock createCPacketUseBlock(ByteBuf buf) { @@ -159,8 +160,8 @@ public static CPacketUseEntity createCPacketUseEntity(ByteBuf buf) { } // Use Item - public static CPacketUseItem createCPacketUseItem(Hand hand) { - return new CPacketUseItemMesh(new PlayerInteractItemC2SPacket(MCEnum.hand(hand))); + public static CPacketUseItem createCPacketUseItem(Hand hand, int sequence) { + return new CPacketUseItemMesh(new PlayerInteractItemC2SPacket(MCEnum.hand(hand), sequence)); } public static CPacketUseItem createCPacketUseItem(ByteBuf buf) { @@ -208,11 +209,11 @@ public static SPacketBreakProgress createSPacketBreakProgress(ByteBuf buf) { // Player Position Rotation public static SPacketPlayerPositionRotation createSPacketPlayerPositionRotation(double x, double y, double z, float yaw, float pitch, Set flags, int teleportId, boolean shouldDismount) { - Set flagSet = new HashSet<>(); + Set flagSet = new HashSet<>(); for(SPacketPlayerPositionRotation.Flag flag: flags) { flagSet.add(SPacketPlayerPositionRotationMesh.FLAGS[flag.ordinal()]); } - return new SPacketPlayerPositionRotationMesh(new PlayerPositionLookS2CPacket(x, y, z, yaw, pitch, flagSet, teleportId, shouldDismount)); + return new SPacketPlayerPositionRotationMesh(new PlayerPositionLookS2CPacket(x, y, z, yaw, pitch, flagSet, teleportId)); } public static SPacketPlayerPositionRotation createSPacketPlayerPositionRotation(ByteBuf buf) { diff --git a/mesh-fabric-1.18.2/src/main/resources/mesh.accesswidener b/version/v1_19_4/src/main/resources/mesh.accesswidener similarity index 95% rename from mesh-fabric-1.18.2/src/main/resources/mesh.accesswidener rename to version/v1_19_4/src/main/resources/mesh.accesswidener index 6615172..1edda1c 100644 --- a/mesh-fabric-1.18.2/src/main/resources/mesh.accesswidener +++ b/version/v1_19_4/src/main/resources/mesh.accesswidener @@ -1,6 +1,5 @@ accessWidener v1 named -Extendable class net/minecraft/util/math/Vec3f Extendable class net/minecraft/block/Material Extendable method net/minecraft/entity/Entity discard ()V diff --git a/mesh-fabric-1.18.2/src/main/resources/mesh.mixins.json b/version/v1_19_4/src/main/resources/mesh.mixins.json similarity index 97% rename from mesh-fabric-1.18.2/src/main/resources/mesh.mixins.json rename to version/v1_19_4/src/main/resources/mesh.mixins.json index 8fa7752..92d5fc9 100644 --- a/mesh-fabric-1.18.2/src/main/resources/mesh.mixins.json +++ b/version/v1_19_4/src/main/resources/mesh.mixins.json @@ -45,7 +45,6 @@ "accessors.entity.player.EntityClientPlayerAccessor", "accessors.packet.BlockUpdateS2CPacketAccessor", "accessors.packet.BoatPaddleStateC2SPacketAccessor", - "accessors.packet.ChatMessageC2SPacketAccessor", "accessors.packet.HandSwingC2SPacketAccessor", "accessors.packet.PlayerInputC2SPacketAccessor", "accessors.packet.PlayerInteractBlockC2SPacketAccessor", @@ -55,6 +54,7 @@ "accessors.packet.PlayerPositionLookS2CPacketAccessor", "accessors.packet.TeleportConfirmC2SPacketAccessor", "accessors.packet.VehicleMoveC2SPacketAccessor", + "accessors.render.VertexBufferAccessor", "events.network.MixinNetworkConnection", "network.MixinNetworkConnectionQueuedPacket" ]