Skip to content

Commit

Permalink
update texture and crumb
Browse files Browse the repository at this point in the history
  • Loading branch information
khjxiaogu committed Sep 19, 2024
1 parent 0227fe7 commit 941a33b
Show file tree
Hide file tree
Showing 26 changed files with 110 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ protected void registerModels() {
}
for(String s:CPItems.bread_bowls)
texture(s+"_loaf", "bread_bowls/"+s);
for(String s:CPItems.dishes)
texture(s+"_loaf", "bread_bowls/"+s);
for (String s : CPItems.base_material)
texture(s);
for (FoodMaterialInfo s : CPItems.food_material)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "caupona:block/litharge_bloom"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "caupona:block/litharge_fumarole_boulder"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "caupona:block/litharge_fumarole_vent"
}
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/crumb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/crumb"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/huevos_pericos"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_beef"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_greens"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_hodgepodge"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_meat"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_mushrooms"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_roots"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_seafood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/sauteed_vegetables"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/seared_fillet"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/seared_poultry"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"duration": 200,
"id": "minecraft:resistance",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"duration": 200,
"id": "minecraft:slow_falling",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"duration": 200,
"id": "minecraft:jump_boost",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"duration": 200,
"id": "caupona:hyperactive",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"duration": 200,
"id": "minecraft:speed",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"duration": 200,
"id": "minecraft:night_vision",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
},
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/teammoeg/caupona/CPItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class CPItems {
new FoodMaterialInfo("plump_snail",3,0.3f,0.7f).food(c->c.effect(()->new MobEffectInstance(MobEffects.HUNGER, 600, 0), 0.3F))};
public static final String[] base_material = new String[] { "lateres", "clay_portable_brazier", "vivid_charcoal", "silphium",
"asafoetida", "leaden_walnut", "litharge_cake", "lead_ingot", "lead_nugget",
"asses","brick_tesserae","basalt_tesserae","pumice_tesserae", "fresh_wolfberry_leaves"};
"asses","brick_tesserae","basalt_tesserae","pumice_tesserae", "fresh_wolfberry_leaves" ,"crumb"};

public static final List<Item> stews = new ArrayList<>();
public static final List<Item> dish = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ default FoodProperties getFood() {
return getFood(0,0).usingConvertsTo(Items.BOWL).build();
}
Fluid getBase();
public List<PossibleEffect> getEffects();
List<PossibleEffect> getEffects();
default float getDensity() {
return getStacks().stream().map(FloatemStack::getCount).reduce(0f, Float::sum);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,5 @@ public Builder getFood(int extraHealing, int extraSaturation) {
return b;
}


}
21 changes: 0 additions & 21 deletions src/main/java/com/teammoeg/caupona/generated/CPStewTexture.java
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
/*
* Copyright (c) 2024 TeamMoeg
*
* This file is part of Caupona.
*
* Caupona is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
*
* Caupona is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Specially, we allow this software to be used alongside with closed source software Minecraft(R) and Forge or other modloader.
* Any mods or plugins can also use apis provided by forge or com.teammoeg.caupona.api without using GPL or open source.
*
* You should have received a copy of the GNU General Public License
* along with Caupona. If not, see <https://www.gnu.org/licenses/>.
*/

/** Copyright (c) 2022 TeamMoeg
*
*
Expand Down

0 comments on commit 941a33b

Please sign in to comment.