Skip to content

Commit

Permalink
Removed code.
Browse files Browse the repository at this point in the history
  • Loading branch information
Yoghurt4C committed Sep 21, 2020
1 parent 4b61edf commit 9e3f9cb
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 34 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
build/
out/
classes/
logs/

# idea

Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ minecraft {
repositories {
maven { url = "https://maven.fabricmc.net/" }
maven { url = "https://jitpack.io" }
maven { url "https://server.bbkr.space/artifactory/libs-release" }
//maven { url "https://server.bbkr.space/artifactory/libs-release" }

flatDir {
dirs "libs"
Expand All @@ -43,7 +43,8 @@ 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:LibDP:${project.libcd_version}"
modImplementation "io.github.cottonmc:Parchment:${project.parchment_version}"
modImplementation "com.github.lambdaurora:spruceui:${project.spruceui_version}"
modImplementation "com.github.lambdaurora.LambdaControls:fabric:${project.lambdacontrols_version}"
}
Expand Down
13 changes: 7 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,22 @@ org.gradle.jvmargs=-Xmx4G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.16.2-pre1
yarn_mappings=1.16.2-pre1+build.5
loader_version=0.9.0+build.204
minecraft_version=1.16.2
yarn_mappings=1.16.2+build.6
loader_version=0.9.1+build.205

# Mod Properties
mod_version = 1.1.8
mod_version = 1.1.9
#maven_group = net.fabricmc
archives_base_name = LilTaterReloaded

# 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.16.3+build.390-1.16
fabric_version=0.17.2+build.396-1.16
mod_menu_version=1.12.2+build.17
rei_version=5.0.1-unstable
flamingo_version=v1.17
libcd_version=2.4.1+1.16-pre2
libcd_version=1.1.0+1.16.2-dev
parchment_version=1.1.01.16.2-dev
spruceui_version=1.5.2
lambdacontrols_version=1.3.2
12 changes: 5 additions & 7 deletions src/main/java/mods/ltr/compat/libcd/LTRLibCDInitializer.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/*
package mods.ltr.compat.libcd;

import io.github.cottonmc.libcd.api.LibCDInitializer;
import io.github.cottonmc.libcd.api.tweaker.TweakerManager;
import io.github.cottonmc.libdp.api.DriverInitializer;
import io.github.cottonmc.libdp.api.driver.DriverManager;

public class LTRLibCDInitializer implements LibCDInitializer {
public class LTRLibCDInitializer implements DriverInitializer {
@Override
public void initTweakers(TweakerManager manager) {
public void init(DriverManager manager) {
manager.addAssistant("mods.ltr.compat.libcd.LilTaterTradeOfferTweaker", new LilTaterTradeOfferTweaker());
}
}
*/
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
/*
package mods.ltr.compat.libcd;

import blue.endless.jankson.JsonObject;
import io.github.cottonmc.libcd.api.tweaker.Tweaker;
import io.github.cottonmc.libcd.api.tweaker.recipe.RecipeParser;
import io.github.cottonmc.libcd.api.tweaker.recipe.RecipeTweaker;
import com.google.gson.JsonObject;
import io.github.cottonmc.libdp.api.driver.Driver;
import io.github.cottonmc.libdp.api.driver.recipe.RecipeDriver;
import io.github.cottonmc.libdp.api.driver.recipe.RecipeParser;
import mods.ltr.registry.LilTaterTradeOffers;
import net.minecraft.item.ItemStack;
import net.minecraft.resource.ResourceManager;
Expand All @@ -17,7 +16,7 @@
import static mods.ltr.registry.LilTaterTradeOffers.tradeOffers;


public class LilTaterTradeOfferTweaker implements Tweaker {
public class LilTaterTradeOfferTweaker implements Driver {
@Override
public void prepareReload(ResourceManager resourceManager) {

Expand All @@ -43,7 +42,7 @@ public void addTradeOffer(String profession, int profession_level, Object buyObj
ItemStack buy = RecipeParser.processItemStack(buyObj);
ItemStack second_buy = RecipeParser.processItemStack(secondBuyObj);
ItemStack sell = RecipeParser.processItemStack(sellObj);
String id = RecipeTweaker.INSTANCE.getRecipeId(sell).toString();
String id = RecipeDriver.INSTANCE.getRecipeId(sell).toString();
VillagerProfession prof = Registry.VILLAGER_PROFESSION.get(new Identifier(profession));
if (prof == VillagerProfession.NONE) { throw new Exception(); }
LilTaterTradeOffers.LTRTradeOfferFactory tradeOfferFactory = new LilTaterTradeOffers.LTRTradeOfferFactory(buy, second_buy, sell, maxUses, experience, multiplier);
Expand All @@ -61,4 +60,3 @@ public void removeTradeOffer(String id) {
}
}
}
*/
10 changes: 10 additions & 0 deletions src/main/resources/data/ltr/diskettes/irritated_lil_tater.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
var DriverUtils = diskette.require("libdp.util.DriverUtils");
var TradeOfferTweaker = diskette.require("mods.ltr.compat.libcd.LilTaterTradeOfferTweaker");

var irritater = DriverUtils.newStack("ltr:lil_tater", 1);
irritater.setName("Irritated Lil Tater");
var potion = DriverUtils.newStack("minecraft:potion",1);
potion.setTagValue("Potion","minecraft:harming");

TradeOfferTweaker.addTradeOffer("minecraft:farmer", 3,
"ltr:lil_tater", potion, irritater, 4, 10, 0.05);
10 changes: 0 additions & 10 deletions src/main/resources/data/ltr/tweakers/irritated_lil_tater.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"rei_plugins_v0": [
"mods.ltr.compat.rei.LilTaterReloadedREIPlugin"
],
"libcd": [
"libdp": [
"mods.ltr.compat.libcd.LTRLibCDInitializer"
]
},
Expand Down

0 comments on commit 9e3f9cb

Please sign in to comment.