Skip to content

Commit

Permalink
A full commitment's what I'm thinking of
Browse files Browse the repository at this point in the history
  • Loading branch information
Yoghurt4C committed Jul 31, 2020
1 parent 52e8958 commit 4b61edf
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies {
//modImplementation "ninjaphenix.ninjatips:NinjaTips:1.0.31.15"
//modImplementation "java.io.github.giantnuker.fabric.tooltipwrap:tooltipwrap:1.0.2"
modImplementation "com.github.Vexatos:Flamingo:${project.flamingo_version}"
modImplementation "io.github.cottonmc:LibCD:${project.libcd_version}"
//modImplementation "io.github.cottonmc:LibCD:${project.libcd_version}"
modImplementation "com.github.lambdaurora:spruceui:${project.spruceui_version}"
modImplementation "com.github.lambdaurora.LambdaControls:fabric:${project.lambdacontrols_version}"
}
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx4G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.16.1
yarn_mappings=1.16.1+build.17
loader_version=0.8.8+build.202
minecraft_version=1.16.2-pre1
yarn_mappings=1.16.2-pre1+build.5
loader_version=0.9.0+build.204

# Mod Properties
mod_version = 1.1.8
Expand All @@ -14,9 +14,9 @@ org.gradle.jvmargs=-Xmx4G

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.14.0+build.371-1.16
fabric_version=0.16.3+build.390-1.16
mod_menu_version=1.12.2+build.17
rei_version=4.5.5
rei_version=5.0.1-unstable
flamingo_version=v1.17
libcd_version=2.4.1+1.16-pre2
spruceui_version=1.5.2
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/mods/ltr/compat/libcd/LTRLibCDInitializer.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
package mods.ltr.compat.libcd;
import io.github.cottonmc.libcd.api.LibCDInitializer;
Expand All @@ -9,3 +10,4 @@ public void initTweakers(TweakerManager manager) {
manager.addAssistant("mods.ltr.compat.libcd.LilTaterTradeOfferTweaker", new LilTaterTradeOfferTweaker());
}
}
*/
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
package mods.ltr.compat.libcd;
import blue.endless.jankson.JsonObject;
Expand All @@ -15,6 +16,7 @@
import static mods.ltr.registry.LilTaterTradeOffers.tradeOffers;
public class LilTaterTradeOfferTweaker implements Tweaker {
@Override
public void prepareReload(ResourceManager resourceManager) {
Expand Down Expand Up @@ -59,3 +61,4 @@ public void removeTradeOffer(String id) {
}
}
}
*/
2 changes: 1 addition & 1 deletion src/main/java/mods/ltr/config/LilTaterReloadedConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static void init() {
"logDebugInfo: Toggles logging various information to help cherry-pick possible issues during init or post-init. [Side: BOTH | Default: false]")
);

File subFolder = new File(FabricLoader.getInstance().getConfigDirectory(), "powertaters");
File subFolder = new File(FabricLoader.getInstance().getConfigDir().toFile(), "powertaters");
if (!subFolder.exists() && !subFolder.mkdir()) {
LOGGER.error("[LTR] Could not create configuration directory: " + subFolder.getAbsolutePath());
}
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/mods/ltr/mixins/barter/PiglinEntityMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import mods.ltr.items.LilTaterBlockItem;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.mob.HostileEntity;
import net.minecraft.entity.mob.PiglinActivity;
import net.minecraft.entity.mob.PiglinEntity;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -18,9 +19,9 @@ protected PiglinEntityMixin(EntityType<? extends HostileEntity> entityType, Worl
}

@Inject(method = "getActivity",at = @At("HEAD"), cancellable = true)
public void ltr_getTaterAdmirationActivity(CallbackInfoReturnable<PiglinEntity.Activity> ctx){
public void ltr_getTaterAdmirationActivity(CallbackInfoReturnable<PiglinActivity> ctx){
if (this.getOffHandStack().getItem() instanceof LilTaterBlockItem) {
ctx.setReturnValue(PiglinEntity.Activity.ADMIRING_ITEM);
ctx.setReturnValue(PiglinActivity.ADMIRING_ITEM);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
public abstract class PlayerManagerMixin {

@Inject(method = "respawnPlayer",at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
public void respawnPlayerWithMeditationTicks(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> ctx, BlockPos pos, boolean bl, ServerWorld world, Optional optional, ServerPlayerInteractionManager manager, ServerWorld sworld, ServerPlayerEntity serverPlayerEntity){
public void respawnPlayerWithMeditationTicks(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> ctx, BlockPos pos, float angle, boolean bl, ServerWorld world, Optional optional, ServerPlayerInteractionManager manager, ServerWorld sworld, ServerPlayerEntity serverPlayerEntity){
int meditationTicks = ((LilTaterMeditationCounter)player).ltr_getMeditationTicks();
((LilTaterMeditationCounter)serverPlayerEntity).ltr_setMeditationTicks(meditationTicks);
}
Expand Down

0 comments on commit 4b61edf

Please sign in to comment.