1.0.3
All checks were successful
RelicCraft/pipeline/head This commit looks good

Final Tweaks
This commit is contained in:
TheBrokenRail 2020-04-05 18:17:42 -04:00
parent 9412c68414
commit e654df798c
12 changed files with 24 additions and 2 deletions

View File

@ -1,5 +1,8 @@
# Changelog # Changelog
**1.0.3**
* Final Tweaks
**1.0.2** **1.0.2**
* Tweaks * Tweaks

View File

@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
fabric_loader_version = 0.7.10+build.191 fabric_loader_version = 0.7.10+build.191
# Mod Properties # Mod Properties
mod_version = 1.0.2 mod_version = 1.0.3
maven_group = com.thebrokenrail maven_group = com.thebrokenrail
archives_base_name = reliccraft archives_base_name = reliccraft

View File

@ -14,6 +14,7 @@ import com.thebrokenrail.reliccraft.entity.RelicEntity;
import com.thebrokenrail.reliccraft.item.TargetedEnderPearlItem; import com.thebrokenrail.reliccraft.item.TargetedEnderPearlItem;
import com.thebrokenrail.reliccraft.item.TimeDilaterItem; import com.thebrokenrail.reliccraft.item.TimeDilaterItem;
import com.thebrokenrail.reliccraft.item.RelicItem; import com.thebrokenrail.reliccraft.item.RelicItem;
import com.thebrokenrail.reliccraft.loot.RelicLootTableFunction;
import com.thebrokenrail.reliccraft.mixin.CriteriaRegistryHook; import com.thebrokenrail.reliccraft.mixin.CriteriaRegistryHook;
import com.thebrokenrail.reliccraft.recipe.RevealRelicRecipe; import com.thebrokenrail.reliccraft.recipe.RevealRelicRecipe;
import com.thebrokenrail.reliccraft.recipe.TimeDilaterRecipe; import com.thebrokenrail.reliccraft.recipe.TimeDilaterRecipe;

View File

@ -14,10 +14,12 @@ public class ActivateTeleportationBeaconCriterion extends AbstractCriterion<Acti
public ActivateTeleportationBeaconCriterion() { public ActivateTeleportationBeaconCriterion() {
} }
@Override
public Identifier getId() { public Identifier getId() {
return ID; return ID;
} }
@Override
public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) { public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
return new Conditions(); return new Conditions();
} }

View File

@ -14,10 +14,12 @@ public class ActivateTeleportationRestrictorCriterion extends AbstractCriterion<
public ActivateTeleportationRestrictorCriterion() { public ActivateTeleportationRestrictorCriterion() {
} }
@Override
public Identifier getId() { public Identifier getId() {
return ID; return ID;
} }
@Override
public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) { public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
return new Conditions(); return new Conditions();
} }

View File

@ -14,10 +14,12 @@ public class DilateTimeCriterion extends AbstractCriterion<DilateTimeCriterion.C
public DilateTimeCriterion() { public DilateTimeCriterion() {
} }
@Override
public Identifier getId() { public Identifier getId() {
return ID; return ID;
} }
@Override
public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) { public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
return new Conditions(); return new Conditions();
} }

View File

@ -14,10 +14,12 @@ public class DuplicateTimeDilaterCriterion extends AbstractCriterion<DuplicateTi
public DuplicateTimeDilaterCriterion() { public DuplicateTimeDilaterCriterion() {
} }
@Override
public Identifier getId() { public Identifier getId() {
return ID; return ID;
} }
@Override
public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) { public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
return new Conditions(); return new Conditions();
} }

View File

@ -14,10 +14,12 @@ public class RevealRelicCriterion extends AbstractCriterion<RevealRelicCriterion
public RevealRelicCriterion() { public RevealRelicCriterion() {
} }
@Override
public Identifier getId() { public Identifier getId() {
return ID; return ID;
} }
@Override
public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) { public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
return new Conditions(); return new Conditions();
} }

View File

@ -14,10 +14,12 @@ public class UseTargetedEnderPearlCriterion extends AbstractCriterion<UseTargete
public UseTargetedEnderPearlCriterion() { public UseTargetedEnderPearlCriterion() {
} }
@Override
public Identifier getId() { public Identifier getId() {
return ID; return ID;
} }
@Override
public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) { public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
return new Conditions(); return new Conditions();
} }

View File

@ -14,10 +14,12 @@ public class UseTeleportationBeaconCriterion extends AbstractCriterion<UseTelepo
public UseTeleportationBeaconCriterion() { public UseTeleportationBeaconCriterion() {
} }
@Override
public Identifier getId() { public Identifier getId() {
return ID; return ID;
} }
@Override
public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) { public Conditions conditionsFromJson(JsonObject jsonObject, JsonDeserializationContext jsonDeserializationContext) {
return new Conditions(); return new Conditions();
} }

View File

@ -1,4 +1,4 @@
package com.thebrokenrail.reliccraft; package com.thebrokenrail.reliccraft.loot;
import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.Moshi; import com.squareup.moshi.Moshi;

View File

@ -22,6 +22,7 @@ public class RevealRelicRecipe extends SpecialCraftingRecipe {
super(id); super(id);
} }
@Override
public boolean matches(CraftingInventory craftingInventory, World world) { public boolean matches(CraftingInventory craftingInventory, World world) {
ItemStack itemStack = ItemStack.EMPTY; ItemStack itemStack = ItemStack.EMPTY;
int netherStar = 0; int netherStar = 0;
@ -46,6 +47,7 @@ public class RevealRelicRecipe extends SpecialCraftingRecipe {
return !itemStack.isEmpty() && netherStar == 1; return !itemStack.isEmpty() && netherStar == 1;
} }
@Override
public ItemStack craft(CraftingInventory craftingInventory) { public ItemStack craft(CraftingInventory craftingInventory) {
ItemStack itemStack = ItemStack.EMPTY; ItemStack itemStack = ItemStack.EMPTY;
@ -77,11 +79,13 @@ public class RevealRelicRecipe extends SpecialCraftingRecipe {
} }
} }
@Override
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public boolean fits(int width, int height) { public boolean fits(int width, int height) {
return width * height >= 2; return width * height >= 2;
} }
@Override
public RecipeSerializer<?> getSerializer() { public RecipeSerializer<?> getSerializer() {
return RelicCraft.REVEAL_RELIC_RECIPE; return RelicCraft.REVEAL_RELIC_RECIPE;
} }