Skip to content

Commit

Permalink
Finish port
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mrbysco
Mrbysco committed Jun 25, 2024
1 parent 6036680 commit 81aec90
Show file tree
Hide file tree
Showing 73 changed files with 236 additions and 274 deletions.
1 change: 0 additions & 1 deletion common/src/main/java/net/chococraft/Chococraft.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import net.chococraft.registry.ModRegistry;
import net.chococraft.registry.ModSounds;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/net/chococraft/common/entity/breeding/BreedingHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static ChocoboColor getColor(AbstractChocobo firstParent, AbstractChocobo
}
}
} else {
Chococraft.LOGGER.error("Breeding Config does not contain " + firstColor.name());
Chococraft.LOGGER.error("Breeding Config does not contain {}", firstColor.name());
}
return ChocoboColor.YELLOW;
}
Expand Down
1 change: 0 additions & 1 deletion common/src/main/java/net/chococraft/common/items/ChocoboSpawnEggItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import net.chococraft.registry.ModEntities;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionResult;
Expand Down
1 change: 0 additions & 1 deletion common/src/main/java/net/chococraft/common/world/worldgen/ModFeatures.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import net.minecraft.core.HolderGetter;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.worldgen.BootstrapContext;
import net.minecraft.data.worldgen.BootstrapContext;
import net.minecraft.data.worldgen.features.FeatureUtils;
import net.minecraft.data.worldgen.placement.PlacementUtils;
import net.minecraft.resources.ResourceKey;
Expand Down
8 changes: 4 additions & 4 deletions common/src/main/java/net/chococraft/registry/ModRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ public class ModRegistry {
public static final RegistrySupplier<Item> CHOCOPEDIA = ITEMS.register("chocopedia", () -> new ChocopediaItem(itemBuilder()));
public static final RegistrySupplier<Item> GYSAHL_CAKE = ITEMS.register("gysahl_cake", () -> new Item(itemBuilder().stacksTo(8)));

public static final RegistrySupplier<Item> CHOCO_DISGUISE_HELMET = ITEMS.register("choco_disguise_helmet", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.HELMET, itemBuilder()));
public static final RegistrySupplier<Item> CHOCO_DISGUISE_CHESTPLATE = ITEMS.register("choco_disguise_chestplate", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.CHESTPLATE, itemBuilder()));
public static final RegistrySupplier<Item> CHOCO_DISGUISE_LEGGINGS = ITEMS.register("choco_disguise_leggings", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.LEGGINGS, itemBuilder()));
public static final RegistrySupplier<Item> CHOCO_DISGUISE_BOOTS = ITEMS.register("choco_disguise_boots", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.BOOTS, itemBuilder()));
public static final RegistrySupplier<Item> CHOCO_DISGUISE_HELMET = ITEMS.register("choco_disguise_helmet", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.HELMET, itemBuilder().durability(ArmorItem.Type.HELMET.getDurability(6))));
public static final RegistrySupplier<Item> CHOCO_DISGUISE_CHESTPLATE = ITEMS.register("choco_disguise_chestplate", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.CHESTPLATE, itemBuilder().durability(ArmorItem.Type.CHESTPLATE.getDurability(6))));
public static final RegistrySupplier<Item> CHOCO_DISGUISE_LEGGINGS = ITEMS.register("choco_disguise_leggings", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.LEGGINGS, itemBuilder().durability(ArmorItem.Type.LEGGINGS.getDurability(6))));
public static final RegistrySupplier<Item> CHOCO_DISGUISE_BOOTS = ITEMS.register("choco_disguise_boots", () -> ChococraftExpectPlatform.constructChocoDisguise(ModArmorMaterial.CHOCO_DISGUISE, ArmorItem.Type.BOOTS, itemBuilder().durability(ArmorItem.Type.BOOTS.getDurability(6))));

//Regular block items
public static final RegistrySupplier<Item> STRAW_ITEM = ITEMS.register("straw", () -> new BlockItem(STRAW.get(), itemBuilder()));
Expand Down
8 changes: 3 additions & 5 deletions ...ecipes/food/chocobo_drumstick_cooked.json → ...ecipes/food/chocobo_drumstick_cooked.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_drumstick_raw"
]
"items": "chococraft:chocobo_drumstick_raw"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_raw_drumstick",
"has_the_recipe"
"has_the_recipe",
"has_raw_drumstick"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...umstick_cooked_from_campfire_cooking.json → ...umstick_cooked_from_campfire_cooking.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_drumstick_raw"
]
"items": "chococraft:chocobo_drumstick_raw"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_raw_drumstick",
"has_the_recipe"
"has_the_recipe",
"has_raw_drumstick"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...hocobo_drumstick_cooked_from_smoking.json → ...hocobo_drumstick_cooked_from_smoking.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_drumstick_raw"
]
"items": "chococraft:chocobo_drumstick_raw"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_raw_drumstick",
"has_the_recipe"
"has_the_recipe",
"has_raw_drumstick"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...dvancements/recipes/food/gysahl_cake.json → ...advancement/recipes/food/gysahl_cake.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:gysahl_green"
]
"items": "chococraft:gysahl_green"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_gysahl_green",
"has_the_recipe"
"has_the_recipe",
"has_gysahl_green"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...s/recipes/food/pickled_gysahl_cooked.json → ...t/recipes/food/pickled_gysahl_cooked.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:pickled_gysahl_raw"
]
"items": "chococraft:pickled_gysahl_raw"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_raw_drumstick",
"has_the_recipe"
"has_the_recipe",
"has_raw_drumstick"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ..._gysahl_cooked_from_campfire_cooking.json → ..._gysahl_cooked_from_campfire_cooking.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:pickled_gysahl_raw"
]
"items": "chococraft:pickled_gysahl_raw"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_raw_drumstick",
"has_the_recipe"
"has_the_recipe",
"has_raw_drumstick"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...d/pickled_gysahl_cooked_from_smoking.json → ...d/pickled_gysahl_cooked_from_smoking.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:pickled_gysahl_raw"
]
"items": "chococraft:pickled_gysahl_raw"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_raw_drumstick",
"has_the_recipe"
"has_the_recipe",
"has_raw_drumstick"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...ents/recipes/food/pickled_gysahl_raw.json → ...ment/recipes/food/pickled_gysahl_raw.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:gysahl_green"
]
"items": "chococraft:gysahl_green"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_gysahl_green",
"has_the_recipe"
"has_the_recipe",
"has_gysahl_green"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...ts/recipes/misc/choco_disguise_boots.json → ...nt/recipes/misc/choco_disguise_boots.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_feather"
]
"items": "chococraft:chocobo_feather"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_feather",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_feather"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...cipes/misc/choco_disguise_chestplate.json → ...cipes/misc/choco_disguise_chestplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_feather"
]
"items": "chococraft:chocobo_feather"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_feather",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_feather"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...s/recipes/misc/choco_disguise_helmet.json → ...t/recipes/misc/choco_disguise_helmet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_feather"
]
"items": "chococraft:chocobo_feather"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_feather",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_feather"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...recipes/misc/choco_disguise_leggings.json → ...recipes/misc/choco_disguise_leggings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_feather"
]
"items": "chococraft:chocobo_feather"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_feather",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_feather"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...ncements/recipes/misc/chocobo_saddle.json → ...ancement/recipes/misc/chocobo_saddle.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_feather"
]
"items": "chococraft:chocobo_feather"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_feather",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_feather"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...ents/recipes/misc/chocobo_saddle_alt.json → ...ment/recipes/misc/chocobo_saddle_alt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_feather"
]
"items": "chococraft:chocobo_feather"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_feather",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_feather"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...nts/recipes/misc/chocobo_saddle_bags.json → ...ent/recipes/misc/chocobo_saddle_bags.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_feather"
]
"items": "chococraft:chocobo_feather"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_feather",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_feather"
]
],
"rewards": {
Expand Down
8 changes: 3 additions & 5 deletions ...nts/recipes/misc/chocobo_saddle_pack.json → ...ent/recipes/misc/chocobo_saddle_pack.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"conditions": {
"items": [
{
"items": [
"chococraft:chocobo_saddle_bags"
]
"items": "chococraft:chocobo_saddle_bags"
}
]
},
Expand All @@ -22,8 +20,8 @@
},
"requirements": [
[
"has_chocobo_saddle_bags",
"has_the_recipe"
"has_the_recipe",
"has_chocobo_saddle_bags"
]
],
"rewards": {
Expand Down
Loading

0 comments on commit 81aec90

Please sign in to comment.