MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change models loading (still WIP)

Browse source
This commit is contained in:
Aleksey 2021-05-18 16:51:41 +03:00
parent 2d23ca72ea
commit 744fe40a00
64 changed files with 437 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/betterend/item/EnchantedPetalItem.java
View file

@ -8,6 +8,8 @@ import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import ru.betterend.registry.EndItems;
import java.util.Optional;
public class EnchantedPetalItem extends ModelProviderItem {
public EnchantedPetalItem() {
super(EndItems.makeItemSettings().rarity(Rarity.RARE).stacksTo(16));
@ -19,7 +21,7 @@ public class EnchantedPetalItem extends ModelProviderItem {
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_GENERATED, "item/hydralux_petal");
}

3
src/main/java/ru/betterend/item/EndArmorItem.java
View file

@ -12,6 +12,7 @@ import net.minecraft.world.item.ArmorMaterial;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
import java.util.UUID;
public class EndArmorItem extends ArmorItem implements ModelProvider {
@ -49,7 +50,7 @@ public class EndArmorItem extends ArmorItem implements ModelProvider {
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createItemGenerated(name);
}
}

4
src/main/java/ru/betterend/item/EndBucketItem.java
View file

@ -7,13 +7,15 @@ import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import ru.betterend.registry.EndItems;
import java.util.Optional;
public class EndBucketItem extends FishBucketItem implements ModelProvider {
public EndBucketItem(EntityType<?> type) {
super(type, Fluids.WATER, EndItems.makeItemSettings().stacksTo(1));
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_GENERATED, name);
}
}

8
src/main/java/ru/betterend/item/EndSpawnEggItem.java
View file

@ -7,19 +7,21 @@ import net.minecraft.world.item.SpawnEggItem;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class EndSpawnEggItem extends SpawnEggItem implements ModelProvider {
public EndSpawnEggItem(EntityType<?> type, int primaryColor, int secondaryColor, Properties settings) {
super(type, primaryColor, secondaryColor, settings);
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_SPAWN_EGG, name);
}
@Override
public BlockModel getModel(ResourceLocation resourceLocation) {
String pattern = Patterns.createJson(Patterns.ITEM_SPAWN_EGG, resourceLocation.getPath());
return BlockModel.fromString(pattern);
Optional<String> pattern = Patterns.createJson(Patterns.ITEM_SPAWN_EGG, resourceLocation.getPath());
return pattern.map(BlockModel::fromString).orElse(null);
}
}

4
src/main/java/ru/betterend/item/ModelProviderDiscItem.java
View file

@ -5,13 +5,15 @@ import net.minecraft.world.item.RecordItem;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class ModelProviderDiscItem extends RecordItem implements ModelProvider {
public ModelProviderDiscItem(int comparatorOutput, SoundEvent sound, Properties settings) {
super(comparatorOutput, sound, settings);
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_GENERATED, name);
}
}

4
src/main/java/ru/betterend/item/ModelProviderItem.java
View file

@ -6,13 +6,15 @@ import net.minecraft.world.item.Item;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class ModelProviderItem extends Item implements ModelProvider {
public ModelProviderItem(Properties settings) {
super(settings);
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createItemGenerated(name);
}

4
src/main/java/ru/betterend/item/tool/EndAxeItem.java
View file

@ -12,6 +12,8 @@ import net.minecraft.world.level.block.state.BlockState;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class EndAxeItem extends AxeItem implements DynamicAttributeTool, ModelProvider {
public EndAxeItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
@ -26,7 +28,7 @@ public class EndAxeItem extends AxeItem implements DynamicAttributeTool, ModelPr
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_HANDHELD, name);
}
}

3
src/main/java/ru/betterend/item/tool/EndHammerItem.java
View file

@ -1,5 +1,6 @@
package ru.betterend.item.tool;
import java.util.Optional;
import java.util.UUID;
import com.google.common.collect.ImmutableMultimap;
@ -135,7 +136,7 @@ public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, M
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_HANDHELD, name);
}
}

4
src/main/java/ru/betterend/item/tool/EndHoeItem.java
View file

@ -5,13 +5,15 @@ import net.minecraft.world.item.Tier;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class EndHoeItem extends HoeItem implements ModelProvider {
public EndHoeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_HANDHELD, name);
}
}

4
src/main/java/ru/betterend/item/tool/EndPickaxeItem.java
View file

@ -15,6 +15,8 @@ import net.minecraft.world.level.block.state.BlockState;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool, ModelProvider {
public EndPickaxeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
@ -38,7 +40,7 @@ public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool,
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_HANDHELD, name);
}
}

4
src/main/java/ru/betterend/item/tool/EndShovelItem.java
View file

@ -14,6 +14,8 @@ import net.minecraft.world.level.block.state.BlockState;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class EndShovelItem extends ShovelItem implements DynamicAttributeTool, ModelProvider {
public EndShovelItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
@ -34,7 +36,7 @@ public class EndShovelItem extends ShovelItem implements DynamicAttributeTool, M
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_HANDHELD, name);
}
}

4
src/main/java/ru/betterend/item/tool/EndSwordItem.java
View file

@ -6,13 +6,15 @@ import net.minecraft.world.item.Tier;
import ru.betterend.client.models.ModelProvider;
import ru.betterend.client.models.Patterns;
import java.util.Optional;
public class EndSwordItem extends SwordItem implements DynamicAttributeTool, ModelProvider {
public EndSwordItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
}
@Override
public String getModelString(String name) {
public Optional<String> getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_HANDHELD, name);
}
}