add 1.20.1
This commit is contained in:
commit
a512e6de59
4
.gitattributes
vendored
Normal file
4
.gitattributes
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
* text eol=lf
|
||||
*.bat text eol=crlf
|
||||
*.jar binary
|
||||
*.class binary
|
119
.gitignore
vendored
Normal file
119
.gitignore
vendored
Normal file
@ -0,0 +1,119 @@
|
||||
# User-specific stuff
|
||||
.idea/
|
||||
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
|
||||
*~
|
||||
|
||||
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||
.fuse_hidden*
|
||||
|
||||
# KDE directory preferences
|
||||
.directory
|
||||
|
||||
# Linux trash folder which might appear on any partition or disk
|
||||
.Trash-*
|
||||
|
||||
# .nfs files are created when an open file is removed but is still being accessed
|
||||
.nfs*
|
||||
|
||||
# General
|
||||
.DS_Store
|
||||
.AppleDouble
|
||||
.LSOverride
|
||||
|
||||
# Icon must end with two \r
|
||||
Icon
|
||||
|
||||
# Thumbnails
|
||||
._*
|
||||
|
||||
# Files that might appear in the root of a volume
|
||||
.DocumentRevisions-V100
|
||||
.fseventsd
|
||||
.Spotlight-V100
|
||||
.TemporaryItems
|
||||
.Trashes
|
||||
.VolumeIcon.icns
|
||||
.com.apple.timemachine.donotpresent
|
||||
|
||||
# Directories potentially created on remote AFP share
|
||||
.AppleDB
|
||||
.AppleDesktop
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
|
||||
# Windows thumbnail cache files
|
||||
Thumbs.db
|
||||
Thumbs.db:encryptable
|
||||
ehthumbs.db
|
||||
ehthumbs_vista.db
|
||||
|
||||
# Dump file
|
||||
*.stackdump
|
||||
|
||||
# Folder config file
|
||||
[Dd]esktop.ini
|
||||
|
||||
# Recycle Bin used on file shares
|
||||
$RECYCLE.BIN/
|
||||
|
||||
# Windows Installer files
|
||||
*.cab
|
||||
*.msi
|
||||
*.msix
|
||||
*.msm
|
||||
*.msp
|
||||
|
||||
# Windows shortcuts
|
||||
*.lnk
|
||||
|
||||
.gradle
|
||||
build/
|
||||
|
||||
# Ignore Gradle GUI config
|
||||
gradle-app.setting
|
||||
|
||||
# Cache of project
|
||||
.gradletasknamecache
|
||||
|
||||
**/build/
|
||||
|
||||
# Common working directory
|
||||
run/
|
||||
runs/
|
||||
|
||||
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||
!gradle-wrapper.jar
|
202
LICENSE
Normal file
202
LICENSE
Normal file
@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
68
build.gradle
Normal file
68
build.gradle
Normal file
@ -0,0 +1,68 @@
|
||||
plugins {
|
||||
id 'fabric-loom' version '1.10.5'
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
version = project.mod_version
|
||||
group = project.maven_group
|
||||
|
||||
base {
|
||||
archivesName = "${project.archives_base_name}-${project.minecraft_version}"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||
mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
|
||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}+${project.minecraft_version}"
|
||||
}
|
||||
|
||||
processResources {
|
||||
inputs.property "version", project.version
|
||||
inputs.property "minecraft_version", project.minecraft_version
|
||||
inputs.property "loader_version", project.loader_version
|
||||
filteringCharset "UTF-8"
|
||||
|
||||
filesMatching("fabric.mod.json") {
|
||||
expand "version": project.version,
|
||||
"minecraft_version": project.minecraft_version,
|
||||
"loader_version": project.loader_version
|
||||
}
|
||||
}
|
||||
|
||||
def targetJavaVersion = 17
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
it.options.encoding = "UTF-8"
|
||||
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
|
||||
it.options.release.set(targetJavaVersion)
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
|
||||
if (JavaVersion.current() < javaVersion) {
|
||||
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
|
||||
}
|
||||
withSourcesJar()
|
||||
}
|
||||
|
||||
jar {
|
||||
from("LICENSE") {
|
||||
rename { "${project.archivesBaseName}_${it}" }
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
create("mavenJava", MavenPublication) {
|
||||
artifactId = project.archives_base_name
|
||||
from components.java
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
maven {
|
||||
name= "Disk"
|
||||
url = uri("D:/git/maven-repository-raw")
|
||||
}
|
||||
}
|
||||
}
|
7
gradle.properties
Normal file
7
gradle.properties
Normal file
@ -0,0 +1,7 @@
|
||||
minecraft_version=1.20.1
|
||||
yarn_mappings=build.1
|
||||
loader_version=0.16.10
|
||||
mod_version=1.0
|
||||
maven_group=com.mingliqiye.minecraft.enchantment.conflict
|
||||
archives_base_name=enchantmentdoesnotconflict
|
||||
fabric_version=0.92.6
|
1
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
1
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1 @@
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
|
11
settings.gradle
Normal file
11
settings.gradle
Normal file
@ -0,0 +1,11 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
maven {
|
||||
name = 'Fabric'
|
||||
url = 'https://maven.fabricmc.net/'
|
||||
}
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
|
||||
rootProject.name= "${archives_base_name}-${minecraft_version}-${mod_version}"
|
@ -0,0 +1,30 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict;
|
||||
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
public class Mod implements ModInitializer {
|
||||
|
||||
public static String MOD_ID = "enchantmentdoesnotconflict";
|
||||
public static final String PROTOCOL_VERSION = "1.0";
|
||||
private static MinecraftServer MINECRAFTSERVER;
|
||||
|
||||
public static MinecraftServer getMinecraftServer(){
|
||||
return MINECRAFTSERVER;
|
||||
}
|
||||
|
||||
public static boolean isClient(){
|
||||
return MINECRAFTSERVER.getOverworld().isClient();
|
||||
}
|
||||
public static boolean isServer(){
|
||||
return !MINECRAFTSERVER.getOverworld().isClient();
|
||||
}
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
ServerLifecycleEvents.SERVER_STARTED.register(
|
||||
(server) -> {
|
||||
MINECRAFTSERVER = server;
|
||||
});
|
||||
}
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.client;
|
||||
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.network.ClientNetworkHandler;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
|
||||
public class ModClient implements ClientModInitializer {
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
ClientNetworkHandler.registerReceivers();
|
||||
}
|
||||
}
|
@ -0,0 +1,111 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.config;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.mojang.logging.LogUtils;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import static com.mingliqiye.minecraft.enchantment.conflict.Mod.MOD_ID;
|
||||
|
||||
public class ModConfig {
|
||||
private static final Path CONFIG_PATH =
|
||||
FabricLoader.getInstance().getConfigDir().resolve(MOD_ID + ".json");
|
||||
private static final Gson GSON =
|
||||
new GsonBuilder().setPrettyPrinting().serializeNulls().create();
|
||||
|
||||
private static ModConfig instance;
|
||||
|
||||
private boolean allowDamageEnchantment = true;
|
||||
private boolean allowInfinityEnchantment = true;
|
||||
private boolean allowPiercingEnchantment = true;
|
||||
private boolean allowProtectionEnchantmentMixin = true;
|
||||
private static final Logger LOGGER = LogUtils.getLogger();
|
||||
|
||||
public ModConfig() {
|
||||
}
|
||||
|
||||
public static ModConfig getInstance() {
|
||||
return ModConfig.instance;
|
||||
}
|
||||
|
||||
public static void setInstance(ModConfig instance) {
|
||||
LOGGER.info("Load Server {} ModConfig {}", MOD_ID, instance);
|
||||
ModConfig.instance = instance;
|
||||
}
|
||||
|
||||
public static ModConfig load() {
|
||||
try {
|
||||
if (Files.exists(CONFIG_PATH)) {
|
||||
return GSON.fromJson(Files.newBufferedReader(CONFIG_PATH),
|
||||
ModConfig.class);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
ModConfig modConfig = new ModConfig();
|
||||
setInstance(modConfig);
|
||||
save();
|
||||
return modConfig;
|
||||
}
|
||||
|
||||
public static void save() {
|
||||
try {
|
||||
Files.writeString(CONFIG_PATH, GSON.toJson(instance));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
setInstance(load());
|
||||
}
|
||||
|
||||
public boolean isAllowDamageEnchantment() {
|
||||
return allowDamageEnchantment;
|
||||
}
|
||||
|
||||
public void setAllowDamageEnchantment(boolean allowDamageEnchantment) {
|
||||
this.allowDamageEnchantment = allowDamageEnchantment;
|
||||
}
|
||||
|
||||
public boolean isAllowInfinityEnchantment() {
|
||||
return allowInfinityEnchantment;
|
||||
}
|
||||
|
||||
public void setAllowInfinityEnchantment(boolean allowInfinityEnchantment) {
|
||||
this.allowInfinityEnchantment = allowInfinityEnchantment;
|
||||
}
|
||||
|
||||
public boolean isAllowPiercingEnchantment() {
|
||||
return allowPiercingEnchantment;
|
||||
}
|
||||
|
||||
public void setAllowPiercingEnchantment(boolean allowPiercingEnchantment) {
|
||||
this.allowPiercingEnchantment = allowPiercingEnchantment;
|
||||
}
|
||||
|
||||
public boolean isAllowProtectionEnchantmentMixin() {
|
||||
return allowProtectionEnchantmentMixin;
|
||||
}
|
||||
|
||||
public void setAllowProtectionEnchantmentMixin(
|
||||
boolean allowProtectionEnchantmentMixin
|
||||
) {
|
||||
this.allowProtectionEnchantmentMixin = allowProtectionEnchantmentMixin;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return this.getClass().getName() + "(" + "allowDamageEnchantment" +
|
||||
"=" + allowDamageEnchantment + "," +
|
||||
"allowInfinityEnchantment" + "=" + allowInfinityEnchantment +
|
||||
"," + "allowPiercingEnchantment" + "=" +
|
||||
allowPiercingEnchantment + "," +
|
||||
"allowProtectionEnchantmentMixin" + "=" +
|
||||
allowProtectionEnchantmentMixin + ")";
|
||||
}
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.mixin;
|
||||
|
||||
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.config.ModConfig;
|
||||
import net.minecraft.enchantment.DamageEnchantment;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(DamageEnchantment.class)
|
||||
public abstract class DamageEnchantmentMixin {
|
||||
|
||||
@Inject(method = "canAccept", at = @At("HEAD"), cancellable = true)
|
||||
private void canAccept(
|
||||
@NotNull Enchantment enchantment,
|
||||
@NotNull CallbackInfoReturnable<Boolean> cir
|
||||
) {
|
||||
if (enchantment instanceof DamageEnchantment) {
|
||||
cir.setReturnValue(ModConfig.getInstance().isAllowDamageEnchantment());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.mixin;
|
||||
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.config.ModConfig;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.InfinityEnchantment;
|
||||
import net.minecraft.enchantment.MendingEnchantment;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(InfinityEnchantment.class)
|
||||
public abstract class InfinityEnchantmentMixin {
|
||||
|
||||
@Inject(method = "canAccept", at = @At("HEAD"), cancellable = true)
|
||||
private void canAccept(
|
||||
@NotNull Enchantment enchantment,
|
||||
@NotNull CallbackInfoReturnable<Boolean> cir
|
||||
) {
|
||||
if (enchantment instanceof MendingEnchantment) {
|
||||
cir.setReturnValue(ModConfig.getInstance().isAllowInfinityEnchantment());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,26 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.mixin;
|
||||
|
||||
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.config.ModConfig;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.Enchantments;
|
||||
import net.minecraft.enchantment.PiercingEnchantment;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(PiercingEnchantment.class)
|
||||
public abstract class PiercingEnchantmentMixin {
|
||||
|
||||
@Inject(method = "canAccept", at = @At("HEAD"), cancellable = true)
|
||||
private void canAccept(
|
||||
@NotNull Enchantment enchantment,
|
||||
@NotNull CallbackInfoReturnable<Boolean> cir
|
||||
) {
|
||||
if (enchantment == Enchantments.MULTISHOT) {
|
||||
cir.setReturnValue(ModConfig.getInstance().isAllowPiercingEnchantment());
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,23 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.mixin;
|
||||
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.config.ModConfig;
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.network.ServerNetWorkSender;
|
||||
import net.minecraft.network.ClientConnection;
|
||||
import net.minecraft.server.PlayerManager;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(PlayerManager.class)
|
||||
public abstract class PlayerManagerMixin {
|
||||
|
||||
@Inject(method = "onPlayerConnect" ,at = @At("RETURN"))
|
||||
private void onPlayerConnect(
|
||||
ClientConnection connection, ServerPlayerEntity player,
|
||||
CallbackInfo ci
|
||||
){
|
||||
ServerNetWorkSender.sendConfigToClient(player, ModConfig.getInstance());
|
||||
}
|
||||
}
|
@ -0,0 +1,26 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.mixin;
|
||||
|
||||
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.config.ModConfig;
|
||||
import net.minecraft.enchantment.ProtectionEnchantment;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(ProtectionEnchantment.class)
|
||||
public abstract class ProtectionEnchantmentMixin {
|
||||
|
||||
@Inject(method = "canAccept", at = @At("HEAD"), cancellable = true)
|
||||
|
||||
private void onCheckCompatibility(
|
||||
@NotNull Enchantment enchantment,
|
||||
@NotNull CallbackInfoReturnable<Boolean> cir
|
||||
) {
|
||||
if (enchantment instanceof ProtectionEnchantment) {
|
||||
cir.setReturnValue(ModConfig.getInstance().isAllowProtectionEnchantmentMixin());
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.network;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonParser;
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.config.ModConfig;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class ClientNetworkHandler {
|
||||
|
||||
public static void registerReceivers() {
|
||||
ClientPlayNetworking.registerGlobalReceiver(
|
||||
NetworkHandler.CONFIG_PACKET_ID,
|
||||
(client, handler, buf, responseSender) -> {
|
||||
JsonElement configData =
|
||||
JsonParser.parseString(buf.readString());
|
||||
client.execute(() -> handleConfigPacket(configData));
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private static void handleConfigPacket(JsonElement configData) {
|
||||
ModConfig config = new Gson().fromJson(configData, ModConfig.class);
|
||||
ModConfig.setInstance(config);
|
||||
}
|
||||
}
|
@ -0,0 +1,10 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.network;
|
||||
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.Mod;
|
||||
|
||||
public class NetworkHandler {
|
||||
public static final Identifier
|
||||
CONFIG_PACKET_ID = new Identifier(Mod.MOD_ID, "config_packet");
|
||||
}
|
@ -0,0 +1,19 @@
|
||||
package com.mingliqiye.minecraft.enchantment.conflict.network;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.mingliqiye.minecraft.enchantment.conflict.config.ModConfig;
|
||||
import io.netty.buffer.Unpooled;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
import net.minecraft.network.PacketByteBuf;
|
||||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
|
||||
@Environment(EnvType.SERVER)
|
||||
public class ServerNetWorkSender {
|
||||
public static void sendConfigToClient(ServerPlayerEntity player, ModConfig config) {
|
||||
PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer());
|
||||
buf.writeString(new Gson().toJson(config));
|
||||
ServerPlayNetworking.send(player, NetworkHandler.CONFIG_PACKET_ID, buf);
|
||||
}
|
||||
}
|
19
src/main/resources/enchantmentdoesnotconflict.mixins.json
Normal file
19
src/main/resources/enchantmentdoesnotconflict.mixins.json
Normal file
@ -0,0 +1,19 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "com.mingliqiye.minecraft.enchantment.conflict.mixin",
|
||||
"compatibilityLevel": "JAVA_17",
|
||||
"mixins": [
|
||||
"DamageEnchantmentMixin",
|
||||
"InfinityEnchantmentMixin",
|
||||
"PiercingEnchantmentMixin",
|
||||
"PlayerManagerMixin",
|
||||
"ProtectionEnchantmentMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
},
|
||||
"overwrites": {
|
||||
"requireAnnotations": true
|
||||
}
|
||||
}
|
28
src/main/resources/fabric.mod.json
Normal file
28
src/main/resources/fabric.mod.json
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "enchantmentdoesnotconflict",
|
||||
"version": "${version}",
|
||||
"name": "enchantmentDoesNotConflict",
|
||||
"description": "移除一些附魔冲突",
|
||||
"authors": [],
|
||||
"contact": {},
|
||||
"license": "Apache-2.0",
|
||||
"icon": "assets/enchantmentdoesnotconflict/icon.png",
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"client": [
|
||||
"com.mingliqiye.minecraft.enchantment.conflict.client.ModClient"
|
||||
],
|
||||
"main": [
|
||||
"com.mingliqiye.minecraft.enchantment.conflict.Mod"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"enchantmentdoesnotconflict.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=${loader_version}",
|
||||
"fabric": "*",
|
||||
"minecraft": "${minecraft_version}"
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user