Skip to content

Commit

Permalink
V1.10.2
Browse files Browse the repository at this point in the history
Fixed beta.8 of MixinExtras
Fixed tooltips not beeing shown on multiplayer if client has mod too
  • Loading branch information
mattymatty97 committed Jun 28, 2023
1 parent d72832e commit 3598749
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 15 deletions.
32 changes: 20 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ dependencies {
modImplementation "carpet:fabric-carpet:${project.carpet_core_version}"
implementation 'de.cronn:reflection-util:2.13.2'
provided group: 'org.apache.commons', name: 'commons-collections4', version: 'latest.release'
provided(annotationProcessor("com.github.LlamaLad7:MixinExtras:${project.mixinextast_version}"))
provided(annotationProcessor("com.github.LlamaLad7.mixinextras:mixinextras-fabric:${project.mixin_extras_fabric_version}"))
//provided(annotationProcessor("com.github.LlamaLad7:MixinExtras:${project.mixin_extras_version}"))

}

Expand Down Expand Up @@ -102,18 +103,25 @@ jar {

// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
if (System.getenv("CI")!=null){
publications {
maven(MavenPublication) {
groupId = this.getGroup()
artifactId = this.getName().toLowerCase()
version = System.getenv("GITHUB_REF_NAME")
from components.java
}
}
repositories {
maven {
name = "GitHubPackages"
url = "https://maven.pkg.github.com/"+System.getenv("GITHUB_REPOSITORY")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
}
}

Expand Down
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ minecraft_version=1.20.1
yarn_mappings=1.20.1+build.8
loader_version=0.14.21
# Mod Properties
mod_version=1.10.1
mod_version=1.10.2
mod_suffix=-MC1.20.1+
maven_group=carpet-shadow-item
archives_base_name=carpet-shadow
# Dependencies
carpet_core_version=1.20-1.4.112+v230608
mixinextast_version=0.2.0-beta.4
mixin_extras_version=0.2.0-beta.4
mixin_extras_fabric_version=0.2.0-beta.8
2 changes: 2 additions & 0 deletions src/main/java/com/carpet_shadow/interfaces/ShadowItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ public interface ShadowItem {
static ItemStack copy_redirect(ItemStack instance, Operation<ItemStack> original) {
ItemStack stack = original.call(instance);
((ShadowItem) (Object) stack).setShadowId(((ShadowItem) (Object) instance).getShadowId());
((ShadowItem) (Object) stack).setClientShadowId(((ShadowItem) (Object) instance).getClientShadowId());
return stack;
}

static ItemStack copy_supplier(ItemStack instance, ItemStack copy) {
((ShadowItem) (Object) copy).setShadowId(((ShadowItem) (Object) instance).getShadowId());
((ShadowItem) (Object) copy).setClientShadowId(((ShadowItem) (Object) instance).getClientShadowId());
return copy;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ItemStack copy_redirect(ItemStack instance, Operation<ItemStack> original
@ModifyReturnValue(method = "getItemStack", at = @At("RETURN"))
public ItemStack getShadowStack(ItemStack ret){
if (CarpetShadowSettings.shadowItemTooltip){
String id = ((ShadowItem)(Object)ret).getShadowId();
String id = ((ShadowItem)(Object)ret).getClientShadowId();
((ShadowItem)(Object)ret).setShadowId(null);
((ShadowItem)(Object)ret).setClientShadowId(id);
}
Expand Down

0 comments on commit 3598749

Please sign in to comment.