Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
this entire fork is a joke and a test for how much weird stuff i could add

mostly drugs lmao
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
public class BallisticsDataGenerator implements DataGeneratorEntrypoint {
@Override
public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {

FabricDataGenerator.Pack pack = fabricDataGenerator.createPack();
}
}
12 changes: 12 additions & 0 deletions src/client/resources/assets/ballistics/items/cartridge.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"model": {
"type": "minecraft:model",
"model": "ballistics:item/cartridge",
"tints": [
{
"type": "minecraft:potion",
"default": 16777215
}
]
}
}
45 changes: 45 additions & 0 deletions src/client/resources/assets/ballistics/items/cig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"model": {
"type": "minecraft:condition",
"property": "minecraft:using_item",
"on_true": {
"type": "minecraft:composite",
"models": [
{
"type": "minecraft:model",
"model": "ballistics:item/smoke/cig"
},
{
"type": "minecraft:model",
"model": "ballistics:item/smoke/cig_overlay"
}
]
},
"on_false": {
"type": "minecraft:select",
"property": "minecraft:display_context",
"cases": [
{
"when": "head",
"model": {
"type": "minecraft:composite",
"models": [
{
"type": "minecraft:model",
"model": "ballistics:item/smoke/cig"
},
{
"type": "minecraft:model",
"model": "ballistics:item/smoke/cig_overlay"
}
]
}
}
],
"fallback": {
"type": "minecraft:model",
"model": "ballistics:item/smoke/cig"
}
}
}
}
31 changes: 31 additions & 0 deletions src/client/resources/assets/ballistics/items/pick.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"model": {
"type": "minecraft:condition",
"property": "minecraft:has_component",
"component": "minecraft:potion_contents",
"ignore_default": true,
"on_true": {
"type": "minecraft:composite",
"models": [
{
"type": "minecraft:model",
"model": "ballistics:item/smoke/pick"
},
{
"type": "minecraft:model",
"model": "ballistics:item/smoke/pick_overlay",
"tints": [
{
"type": "minecraft:potion",
"default": 16777215
}
]
}
]
},
"on_false": {
"type": "minecraft:model",
"model": "ballistics:item/smoke/pick"
}
}
}
12 changes: 12 additions & 0 deletions src/client/resources/assets/ballistics/items/snortable.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"model": {
"type": "minecraft:model",
"model": "minecraft:item/sugar",
"tints": [
{
"type": "minecraft:dye",
"default": 16777215
}
]
}
}
12 changes: 12 additions & 0 deletions src/client/resources/assets/ballistics/items/vape.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"model": {
"type": "minecraft:model",
"model": "ballistics:item/smoke/vape",
"tints": [
{
"type": "minecraft:potion",
"default": 16777215
}
]
}
}
16 changes: 15 additions & 1 deletion src/client/resources/assets/ballistics/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"item.ballistics.rh_glove": "Rocket Handling Glove",
"itemGroup.ballistics": "Ballistics",
"itemGroup.ballistics_flasks": "Ballistics Flasks",
"itemGroup.ballistics_geeked": "Ballistics Baked",
"item.ballistics.prick": "Prick",
"item.ballistics.drink_mixer": "Drink Mixer",
"item.ballistics.flintlock_barrel": "Flintlock Barrel",
Expand All @@ -16,6 +17,12 @@
"item.minecraft.lingering_potion.effect.mixed": "Mixed Lingering Potion",
"item.minecraft.tipped_arrow.effect.mixed": "Mixed Arrow",
"item.ballistics.flask.effect.mixed": "Mixed Flask",
"effect.ballistics.explode": "Explode",
"item.minecraft.potion.effect.explode": "Exploding Potion",
"item.minecraft.splash_potion.effect.explode": "Exploding Splash Potion",
"item.minecraft.lingering_potion.effect.explode": "Exploding Lingering Potion",
"item.minecraft.tipped_arrow.effect.explode": "Exploding Arrow",
"item.ballistics.flask.effect.explode": "Exploding Flask",

"item.ballistics.flask": "Flask",
"item.ballistics.flask.effect.awkward": "Awkward Flask",
Expand Down Expand Up @@ -43,5 +50,12 @@
"item.ballistics.flask.effect.water_breathing": "Flask of Water Breathing",
"item.ballistics.flask.effect.weakness": "Flask of Weakness",
"item.ballistics.flask.effect.weaving": "Flask of Weaving",
"item.ballistics.flask.effect.wind_charged": "Flask of Wind Charging"
"item.ballistics.flask.effect.wind_charged": "Flask of Wind Charging",

"item.ballistics.snortable": "Snortable ",
"item.ballistics.custom_cig": "Custom Cig",
"item.ballistics.cig": "Cig",
"item.ballistics.vape": "Vape",
"item.ballistics.pick": "Pick",
"item.ballistics.cartridge": "Cartridge"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "ballistics:item/cartridge"
}
}
35 changes: 35 additions & 0 deletions src/client/resources/assets/ballistics/models/item/smoke/cig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"format_version": "1.21.11",
"credit": "Made with Blockbench",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "ballistics:item/smoke/cig"
},
"display": {
"thirdperson_righthand": {
"rotation": [0, -90, 0],
"translation": [-1, -0.5, 0],
"scale": [0.55, 0.55, 0.55]
},
"thirdperson_lefthand": {
"rotation": [0, 90, 0],
"translation": [-1, -0.5, 0],
"scale": [0.55, 0.55, 0.55]
},
"firstperson_righthand": {
"rotation": [0, -90, 0],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"firstperson_lefthand": {
"rotation": [0, 90, 0],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"head": {
"rotation": [-111.92, -22.6, -146.7],
"translation": [3.25, -5.25, -8.5],
"scale": [0.5, 0.5, 0.5]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"format_version": "1.21.11",
"credit": "Made with Blockbench",
"parent": "ballistics:item/smoke/cig",
"textures": {
"layer0": "ballistics:item/smoke/cig_overlay"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"format_version": "1.21.11",
"credit": "Made with Blockbench",
"parent": "ballistics:item/smoke/cig",
"textures": {
"layer0": "ballistics:item/smoke/pick"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"format_version": "1.21.11",
"credit": "Made with Blockbench",
"parent": "ballistics:item/smoke/cig",
"textures": {
"layer0": "ballistics:item/smoke/pick_overlay"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"format_version": "1.21.11",
"credit": "Made with Blockbench",
"parent": "ballistics:item/smoke/cig",
"textures": {
"layer0": "ballistics:item/smoke/vape_overlay",
"layer1": "ballistics:item/smoke/vape"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions src/main/java/llevc/ballistics/Ballistics.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package llevc.ballistics;

import llevc.ballistics.recipes.DrinkMixerRecipeSerializer;
import llevc.ballistics.recipes.FlaskRecipeSerializer;
import llevc.ballistics.recipes.FlintlockLoadRecipeSerializer;
import llevc.ballistics.recipes.MixedDrinkRecipeSerializer;
import llevc.ballistics.recipes.*;
import net.fabricmc.api.ModInitializer;

import net.minecraft.core.Registry;
Expand All @@ -30,6 +27,10 @@ public void onInitialize() {
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, FlaskRecipeSerializer.ID, FlaskRecipeSerializer.INSTANCE);
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, DrinkMixerRecipeSerializer.ID, DrinkMixerRecipeSerializer.INSTANCE);
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, MixedDrinkRecipeSerializer.ID, MixedDrinkRecipeSerializer.INSTANCE);
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, SnortableRecipeSerializer.ID, SnortableRecipeSerializer.INSTANCE);
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, PickRecipeSerializer.ID, PickRecipeSerializer.INSTANCE);
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, CartridgeRecipeSerializer.ID, CartridgeRecipeSerializer.INSTANCE);
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, GeekedRecipeSerializer.ID, GeekedRecipeSerializer.INSTANCE);
Registry.register(BuiltInRegistries.RECIPE_SERIALIZER, FlintlockLoadRecipeSerializer.ID, FlintlockLoadRecipeSerializer.INSTANCE);

LOGGER.info("if you read this you're prolly gonna be touched within the next 16 hours");
Expand Down
Loading
Loading